DATAES-107 - Release version 1.0.2.RELEASE (Dijkstra SR2).

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,12 +0,0 @@
-<!--
-
-Thank you for proposing a pull request. This template will guide you through the essential steps necessary for a pull request.
-Make sure that:
-
--->
-
-- [ ] You have read the [Spring Data contribution guidelines](https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.adoc).
-- [ ] There is a ticket in the bug tracker for the project in our [JIRA](https://jira.spring.io/browse/DATAES).
-- [ ] You use the code formatters provided [here](https://github.com/spring-projects/spring-data-build/tree/master/etc/ide) and have them applied to your changes. Don’t submit any formatting related changes.
-- [ ] You submit test cases (unit or integration tests) that back your changes.
-- [ ] You added yourself as author in the headers of the classes you touched. Amend the date range in the Apache license header if needed. For new types, add the license header (copy from another file and set the current year only).

.gitignore

@@ -6,6 +6,9 @@ atlassian-ide-plugin.xml
 ## ignore any target dir
 target
 
+##ignore only top level data dir - local node data files for unit tests
+/data
+
 ## Ignore project files created by Eclipse
 .settings
 .project

CODE_OF_CONDUCT.adoc

@@ -1,27 +0,0 @@
-= Contributor Code of Conduct
-
-As contributors and maintainers of this project, and in the interest of fostering an open and welcoming community, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
-
-We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, or nationality.
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing other's private information, such as physical or electronic addresses,
-  without explicit permission
-* Other unethical or unprofessional conduct
-
-Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
-
-By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. Project maintainers who do not follow or enforce the Code of Conduct may be permanently removed from the project team.
-
-This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at spring-code-of-conduct@pivotal.io.
-All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
-Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
-
-This Code of Conduct is adapted from the http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/].

CONTRIBUTING.adoc

@@ -1,3 +0,0 @@
-= Spring Data contribution guidelines
-
-You find the contribution guidelines for Spring Data projects https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.adoc[here].

README.md

@@ -11,12 +11,12 @@ Guide
 ------------
 
 * [Reference Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/)
+* [PDF Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/current/reference/pdf/spring-data-elasticsearch-reference.pdf)
 * [API Documentation](http://docs.spring.io/spring-data/elasticsearch/docs/current/api/)
-* [Spring Data Project](http://projects.spring.io/spring-data)
+* [Spring Data Project](http://project.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](http://stackoverflow.com/questions/tagged/spring-data-elasticsearch)
+* For more detailed questions, use the [forum](http://forum.springsource.org/forumdisplay.php?f=80).
 
 
 Quick Start
@@ -31,7 +31,7 @@ Add the Maven dependency:
 <dependency>
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-elasticsearch</artifactId>
-    <version>x.y.z.RELEASE</version>
+    <version>1.0.0.RELEASE</version>
 </dependency>
 ```
 
@@ -42,7 +42,7 @@ the appropriate dependency version.
 <dependency>
   <groupId>org.springframework.data</groupId>
   <artifactId>spring-data-elasticsearch</artifactId>
-  <version>x.y.z.BUILD-SNAPSHOT</version>
+  <version>1.0.0.BUILD-SNAPSHOT</version>
 </dependency>
 
 <repository>
@@ -52,19 +52,6 @@ the appropriate dependency version.
 </repository>
 ```
 
-|   spring data elasticsearch         | elasticsearch |
-|:-----------------------------------:|:-------------:|
-|           3.0.0.RC1                 |      5.5.0    |
-|           3.0.0.M4                  |      5.4.0    |
-|           2.0.4.RELEASE             |      2.4.0    |
-|           2.0.0.RELEASE             |      2.2.0    |
-|           1.4.0.M1                  |      1.7.3    |
-|           1.3.0.RELEASE             |      1.5.2    |
-|           1.2.0.RELEASE             |      1.4.4    |
-|           1.1.0.RELEASE             |      1.3.2    |
-|           1.0.0.RELEASE             |      1.1.1    |
-
-
 ### 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.
 
@@ -242,14 +229,14 @@ Using Transport Client
 
 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.  
+* Get involved with the Spring community on the Spring Community Forums.  Please help out on the [forum](http://forum.springsource.org/forumdisplay.php?f=80) by responding to questions and joining the debate.
+* Create [JIRA](https://jira.springframework.org/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](http://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](http://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.
+Before we accept a non-trivial patch or pull request we will need you to sign the [contributor's agreement](https://support.springsource.com/spring_committer_signup).  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.  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)
+[More information about contributing to Spring Data](https://github.com/spring-projects/spring-data-build/blob/master/CONTRIBUTING.md)

pom.xml

@@ -1,243 +1,178 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
+	<modelVersion>4.0.0</modelVersion>
 
-    <groupId>org.springframework.data</groupId>
-    <artifactId>spring-data-elasticsearch</artifactId>
-    <version>3.0.0.RC2</version>
+	<groupId>org.springframework.data</groupId>
+	<artifactId>spring-data-elasticsearch</artifactId>
+	<version>1.0.2.RELEASE</version>
 
-    <parent>
-        <groupId>org.springframework.data.build</groupId>
-        <artifactId>spring-data-parent</artifactId>
-        <version>2.0.0.RC2</version>
-    </parent>
+	<parent>
+		<groupId>org.springframework.data.build</groupId>
+		<artifactId>spring-data-parent</artifactId>
+		<version>1.4.2.RELEASE</version>
+		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
+	</parent>
 
-    <name>Spring Data Elasticsearch</name>
-    <description>Spring Data Implementation for Elasticsearch</description>
-    <url>https://github.com/spring-projects/spring-data-elasticsearch</url>
+	<name>Spring Data Elasticsearch</name>
+	<description>Spring Data Implementation for Elasticsearch</description>
+	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
 
-    <properties>
-        <commonscollections>3.2.1</commonscollections>
-        <commonslang>2.6</commonslang>
-        <elasticsearch>5.5.0</elasticsearch>
-        <springdata.commons>2.0.0.RC2</springdata.commons>
-    </properties>
+	<properties>
 
-    <dependencies>
+		<dist.key>DATAES</dist.key>
 
-        <!-- Spring -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+		<commonscollections>3.2.1</commonscollections>
+		<commonslang>2.6</commonslang>
+		<elasticsearch>1.1.1</elasticsearch>
+		<springdata.commons>1.8.2.RELEASE</springdata.commons>
 
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-        </dependency>
+	</properties>
 
-        <!-- SPRING DATA -->
-        <dependency>
-            <groupId>org.springframework.data</groupId>
-            <artifactId>spring-data-commons</artifactId>
-            <version>${springdata.commons}</version>
-        </dependency>
+	<dependencies>
 
-        <!-- APACHE -->
-        <dependency>
-            <groupId>commons-lang</groupId>
-            <artifactId>commons-lang</artifactId>
-            <version>${commonslang}</version>
-        </dependency>
+		<!-- Spring -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>commons-logging</groupId>
+					<artifactId>commons-logging</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 
-        <!-- JODA Time -->
-        <dependency>
-            <groupId>joda-time</groupId>
-            <artifactId>joda-time</artifactId>
-            <version>${jodatime}</version>
-        </dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+		</dependency>
 
-        <!-- Elasticsearch -->
-        <dependency>
-            <groupId>org.elasticsearch</groupId>
-            <artifactId>elasticsearch</artifactId>
-            <version>${elasticsearch}</version>
-        </dependency>
+		<!-- SPRING DATA -->
+		<dependency>
+			<groupId>org.springframework.data</groupId>
+			<artifactId>spring-data-commons</artifactId>
+			<version>${springdata.commons}</version>
+		</dependency>
 
-        <dependency>
-            <groupId>org.elasticsearch.client</groupId>
-            <artifactId>transport</artifactId>
-            <version>${elasticsearch}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>commons-logging</groupId>
-                    <artifactId>commons-logging</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+		<!-- APACHE -->
+		<dependency>
+			<groupId>commons-lang</groupId>
+			<artifactId>commons-lang</artifactId>
+			<version>${commonslang}</version>
+		</dependency>
+		<dependency>
+			<groupId>commons-collections</groupId>
+			<artifactId>commons-collections</artifactId>
+			<version>${commonscollections}</version>
+		</dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>log4j-over-slf4j</artifactId>
-            <version>1.7.22</version>
-        </dependency>
+		<!-- JODA Time -->
+		<dependency>
+			<groupId>joda-time</groupId>
+			<artifactId>joda-time</artifactId>
+			<version>${jodatime}</version>
+		</dependency>
 
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <version>2.8.2</version>
-        </dependency>
+		<!-- Elasticsearch -->
+		<dependency>
+			<groupId>org.elasticsearch</groupId>
+			<artifactId>elasticsearch</artifactId>
+			<version>${elasticsearch}</version>
+		</dependency>
 
-        <!-- Jackson JSON Mapper -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson}</version>
-        </dependency>
+		<!-- Jackson JSON Mapper -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>${jackson}</version>
+		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>${jackson}</version>
+		</dependency>
 
-        <!-- CDI -->
-        <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <version>${cdi}</version>
-            <scope>provided</scope>
-            <optional>true</optional>
-        </dependency>
+		<!-- CDI -->
+		<dependency>
+			<groupId>javax.enterprise</groupId>
+			<artifactId>cdi-api</artifactId>
+			<version>${cdi}</version>
+			<scope>provided</scope>
+			<optional>true</optional>
+		</dependency>
 
-        <!-- Test -->
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>ch.qos.logback</groupId>
-                    <artifactId>logback-classic</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.openwebbeans.test</groupId>
-            <artifactId>cditest-owb</artifactId>
-            <version>${webbeans}</version>
-            <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-jcdi_1.0_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.geronimo.specs</groupId>
-                    <artifactId>geronimo-atinject_1.0_spec</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>3.0-alpha-1</version>
-            <scope>test</scope>
-        </dependency>
+		<!-- Test -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-test</artifactId>
+			<version>${spring}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.openwebbeans.test</groupId>
+			<artifactId>cditest-owb</artifactId>
+			<version>${webbeans}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>3.0-alpha-1</version>
+			<scope>test</scope>
+		</dependency>
 
-        <dependency>
-      <!-- required by elasticsearch -->
-            <groupId>org.elasticsearch.plugin</groupId>
-            <artifactId>transport-netty4-client</artifactId>
-            <version>${elasticsearch}</version>
-            <!--<scope>test</scope>-->
-        </dependency>
+	</dependencies>
 
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok}</version>
-            <scope>test</scope>
-        </dependency>
+	<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>
+		</plugins>
+	</build>
 
+	<developers>
+		<developer>
+			<id>biomedcentral</id>
+			<name>BioMed Central Development Team</name>
+			<timezone>+0</timezone>
+		</developer>
+	</developers>
 
+	<repositories>
+		<repository>
+			<id>spring-libs-release</id>
+			<url>http://repo.spring.io/libs-release</url>
+		</repository>
+	</repositories>
 
-    </dependencies>
+	<pluginRepositories>
+		<pluginRepository>
+			<id>spring-plugins-release</id>
+			<url>http://repo.spring.io/plugins-release</url>
+		</pluginRepository>
+	</pluginRepositories>
 
-    <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>
-        </plugins>
-    </build>
+	<scm>
+		<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
+		<connection>scm:git:git://github.com/spring-projects/spring-data-elasticsearch.git</connection>
+		<developerConnection>scm:git:ssh://git@github.com/spring-projects/spring-data-elasticsearch.git
+		</developerConnection>
+	</scm>
 
-    <profiles>
-        <profile>
-            <id>release</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.jfrog.buildinfo</groupId>
-                        <artifactId>artifactory-maven-plugin</artifactId>
-                        <inherited>false</inherited>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+	<ciManagement>
+		<system>Bamboo</system>
+		<url>http://build.springsource.org/browse/SPRINGDATAES</url>
+	</ciManagement>
 
-    <developers>
-        <developer>
-            <id>biomedcentral</id>
-            <name>BioMed Central Development Team</name>
-            <timezone>+0</timezone>
-        </developer>
-    </developers>
-
-    <repositories>
-        <repository>
-            <id>spring-libs-milestone</id>
-            <url>https://repo.spring.io/libs-milestone</url>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-plugins-release</id>
-            <url>https://repo.spring.io/plugins-release</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <scm>
-        <url>https://github.com/spring-projects/spring-data-elasticsearch</url>
-        <connection>scm:git:git://github.com/spring-projects/spring-data-elasticsearch.git</connection>
-        <developerConnection>scm:git:ssh://git@github.com/spring-projects/spring-data-elasticsearch.git
-        </developerConnection>
-    </scm>
-
-    <ciManagement>
-        <system>Bamboo</system>
-        <url>https://build.spring.io/browse/SPRINGDATAES</url>
-    </ciManagement>
-
-    <issueManagement>
-        <system>JIRA</system>
-        <url>https://jira.spring.io/browse/DATAES</url>
-    </issueManagement>
+	<issueManagement>
+		<system>JIRA</system>
+		<url>https://jira.springsource.org/browse/DATAES</url>
+	</issueManagement>
 
 </project>

src/docbkx/index.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+        "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<book xmlns:xi="http://www.w3.org/2001/XInclude">
+    <bookinfo>
+        <title>Spring Data Elasticsearch</title>
+        <authorgroup>
+            <author>
+                <firstname>BioMed Central</firstname>
+                <surname>Development Team</surname>
+            </author>
+        </authorgroup>
+        <legalnotice>
+            <para>
+                Copies of this document may be made for your own use and for
+                distribution to others, provided that you do not
+                charge any fee for
+                such copies and further provided that each copy
+                contains this
+                Copyright Notice, whether
+                distributed in print or electronically.
+            </para>
+        </legalnotice>
+
+        <copyright>
+            <year>2013-2014</year>
+            <holder>The original author(s)</holder>
+        </copyright>
+    </bookinfo>
+
+    <toc/>
+
+    <xi:include href="preface.xml"/>
+
+    <part id="reference">
+        <title>Reference Documentation</title>
+
+        <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.8.2.RELEASE/src/docbkx/repositories.xml">
+            <xi:fallback
+                    href="../../../spring-data-commons/src/docbkx/repositories.xml"/>
+        </xi:include>
+
+        <xi:include href="reference/data-elasticsearch.xml"/>
+        <xi:include href="reference/elasticsearch-misc.xml"/>
+    </part>
+
+    <part id="appendix">
+        <title>Appendix</title>
+        <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.8.2.RELEASE/src/docbkx/repository-namespace-reference.xml">
+            <xi:fallback
+                    href="../../../spring-data-commons/src/docbkx/repository-namespace-reference.xml"/>
+        </xi:include>
+        <xi:include href="https://raw.github.com/SpringSource/spring-data-commons/1.8.2.RELEASE/src/docbkx/repository-query-keywords-reference.xml">
+            <xi:fallback
+                    href="../../../spring-data-commons/src/docbkx/repository-query-keywords-reference.xml"/>
+        </xi:include>
+    </part>
+
+</book>

src/docbkx/preface.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE preface PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+        "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<preface id="preface">
+    <title>Preface</title>
+    <para>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.
+    </para>
+    <section id="project">
+        <title>Project Metadata</title>
+        <itemizedlist spacing="compact">
+            <listitem>
+                <para>
+                    Version Control -
+                    <ulink
+                            url="git://github.com/BioMedCentralLtd/spring-data-elasticsearch.git">
+                        git://github.com/BioMedCentralLtd/spring-data-elasticsearch.git
+                    </ulink>
+                </para>
+            </listitem>
+        </itemizedlist>
+    </section>
+    <section id="requirements">
+        <title>Requirements</title>
+        <para>
+            Requires
+            <ulink url="http://www.elasticsearch.org/download/">Elasticsearch</ulink>
+            0.20.2 and above or optional dependency or not even that if you are
+            using Embedded Node Client
+        </para>
+    </section>
+</preface>

src/docbkx/reference/data-elasticsearch.xml

@@ -0,0 +1,508 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+        "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<chapter id="elasticsearch.repositories">
+    <title>Elasticsearch Repositories</title>
+    <abstract>
+        <para>This chapter includes details of the Elasticsearch repository
+            implementation.
+        </para>
+    </abstract>
+    <section id="elasticsearch.introduction">
+        <title>Introduction</title>
+
+        <section id="elasticsearch.namespace">
+            <title>Spring Namespace</title>
+
+            <para>
+                The Spring Data Elasticsearch module contains a custom namespace
+                allowing
+                definition of repository beans as well as elements for
+                instantiating
+                a
+                <classname>ElasticsearchServer</classname>
+                .
+            </para>
+
+            <para>
+                Using the
+                <code>repositories</code>
+                element looks up Spring Data repositories as described in
+                <xref linkend="repositories.create-instances"/>
+                .
+            </para>
+
+            <example>
+                <title>Setting up Elasticsearch repositories using Namespace</title>
+                <programlisting language="xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+                    &lt;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
+                    http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+                    http://www.springframework.org/schema/data/elasticsearch
+                    http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd"&gt;
+
+                    &lt;elasticsearch:repositories base-package="com.acme.repositories" /&gt;
+                    &lt;/beans&gt;</programlisting>
+            </example>
+
+            <para>
+                Using the
+                <code>Transport Client</code>
+                or
+                <code>Node Client</code>
+                element registers an instance of
+                <code>Elasticsearch Server</code>
+                in the context.
+
+                <example>
+                    <title>Transport Client using Namespace</title>
+                    <programlisting language="xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+                        &lt;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
+                        http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+                        http://www.springframework.org/schema/data/elasticsearch
+                        http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd"&gt;
+
+                        &lt;elasticsearch:transport-client id="client" cluster-nodes="localhost:9300,someip:9300" /&gt;
+                        &lt;/beans&gt; </programlisting>
+                </example>
+
+                <example>
+                    <title>Node Client using Namespace</title>
+                    <programlisting language="xml">&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+                        &lt;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
+                        http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+                        http://www.springframework.org/schema/data/elasticsearch
+                        http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd"&gt;
+
+                        &lt;elasticsearch:node-client id="client" local="true"" /&gt;
+                        &lt;/beans&gt; </programlisting>
+                </example>
+            </para>
+        </section>
+        <section id="elasticsearch.annotation">
+            <title>Annotation based configuration</title>
+            <para>The Spring Data Elasticsearch repositories support cannot only
+                be
+                activated through an XML namespace but also using an annotation
+                through JavaConfig.
+            </para>
+            <example>
+                <title>Spring Data Elasticsearch repositories using JavaConfig
+                </title>
+                <programlisting language="java">
+                    @Configuration
+                    @EnableElasticsearchRepositories(basePackages =
+                    "org/springframework/data/elasticsearch/repositories")
+                    static class Config {
+
+                    @Bean
+                    public ElasticsearchOperations elasticsearchTemplate() {
+                    return new ElasticsearchTemplate(nodeBuilder().local(true).node().client());
+                    }
+                    }
+                </programlisting>
+                <para>
+                    The configuration above sets up an
+                    <classname>Embedded Elasticsearch Server</classname>
+                    which is used by the
+                    <classname>ElasticsearchTemplate</classname>
+                    . Spring Data Elasticsearch Repositories are activated using the
+                    <interfacename>@EnableElasticsearchRepositories</interfacename>
+                    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.
+                </para>
+            </example>
+        </section>
+        <section id="elasticsearch.cdi">
+            <title>Elasticsearch Repositores using CDI</title>
+            <para>The Spring Data Elasticsearch repositories can also be set up
+                using CDI
+                functionality.
+            </para>
+            <example>
+                <title>Spring Data Elasticsearch repositories using JavaConfig
+                </title>
+                <programlisting language="java">class ElasticsearchTemplateProducer {
+
+                    @Produces
+                    @ApplicationScoped
+                    public ElasticsearchOperations createElasticsearchTemplate() {
+                    return new ElasticsearchTemplate(nodeBuilder().local(true).node().client());
+                    }
+                    }
+
+                    class ProductService {
+
+                    private ProductRepository repository;
+
+                    public Page&lt;Product&gt; findAvailableBookByName(String name, Pageable pageable) {
+                    return repository.findByAvailableTrueAndNameStartingWith(name, pageable);
+                    }
+
+                    @Inject
+                    public void setRepository(ProductRepository repository) {
+                    this.repository = repository;
+                    }
+                    }
+                </programlisting>
+            </example>
+        </section>
+    </section>
+    <section id="elasticsearch.query-methods">
+        <title>Query methods</title>
+        <section id="elasticsearch.query-methods.finders">
+            <title>Query lookup strategies</title>
+            <para>
+                The Elasticsearch module supports all basic query building
+                feature as String,Abstract,Criteria or
+                have
+                it being derived from the
+                method name.
+            </para>
+
+            <simplesect>
+                <title>Declared queries</title>
+                <para>
+                    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
+                    <interfacename>@Query</interfacename>
+                    annotation (see
+                    <xref linkend="elasticsearch.query-methods.at-query"/>
+                    ).
+                </para>
+            </simplesect>
+        </section>
+
+        <section id="elasticsearch.query-methods.criterions">
+            <title>Query creation</title>
+
+            <para>
+                Generally the query creation mechanism for Elasticsearch works as
+                described
+                in
+                <xref linkend="repositories.query-methods"/>
+                . Here's a short example
+                of what a Elasticsearch query method
+                translates into:
+                <example>
+                    <title>Query creation from method names</title>
+                    <programlisting language="java">public interface BookRepository extends Repository&lt;Book, String&gt;
+                        {
+                        List&lt;Book&gt; findByNameAndPrice(String name, Integer price);
+                        }
+                    </programlisting>
+                    <para>
+                        The method name above will be translated into the following
+                        Elasticsearch json query
+                    </para>
+                    <programlisting>
+                        { "bool" :
+                        { "must" :
+                        [
+                        { "field" : {"name" : "?"} },
+                        { "field" : {"price" : "?"} }
+                        ] } }
+                    </programlisting>
+                </example>
+            </para>
+            <para>
+                A list of supported keywords for Elasticsearch is shown below.
+                <table>
+                    <title>Supported keywords inside method names</title>
+                    <tgroup cols="3">
+                        <colspec colwidth="1*"/>
+                        <colspec colwidth="2*"/>
+                        <colspec colwidth="3*"/>
+                        <thead>
+                            <row>
+                                <entry>Keyword</entry>
+                                <entry>Sample</entry>
+                                <entry>Elasticsearch Query String</entry>
+                            </row>
+                        </thead>
+                        <tbody>
+                            <row>
+                                <entry>
+                                    <code>And</code>
+                                </entry>
+                                <entry>
+                                    <code>findByNameAndPrice</code>
+                                </entry>
+                                <entry>
+                                    <code>{"bool" : {"must" : [ {"field" : {"name" : "?"}},
+                                        {"field" : {"price" : "?"}} ]}}
+                                    </code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>Or</code>
+                                </entry>
+                                <entry>
+                                    <code>findByNameOrPrice</code>
+                                </entry>
+                                <entry>
+                                    <code>{"bool" : {"should" : [ {"field" : {"name" : "?"}},
+                                        {"field" : {"price" : "?"}} ]}}
+                                    </code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>Is</code>
+                                </entry>
+                                <entry>
+                                    <code>findByName</code>
+                                </entry>
+                                <entry>
+                                    <code>{"bool" : {"must" : {"field" : {"name" : "?"}}}}</code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>Not</code>
+                                </entry>
+                                <entry>
+                                    <code>findByNameNot</code>
+                                </entry>
+                                <entry>
+                                    <code>{"bool" : {"must_not" : {"field" : {"name" : "?"}}}}
+                                    </code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>Between</code>
+                                </entry>
+                                <entry>
+                                    <code>findByPriceBetween</code>
+                                </entry>
+                                <entry>
+                                    <code>{"bool" : {"must" : {"range" : {"price" : {"from" :
+                                        ?,"to" : ?,"include_lower" : true,"include_upper" : true}}}}}
+                                    </code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>LessThanEqual</code>
+                                </entry>
+                                <entry>
+                                    <code>findByPriceLessThan</code>
+                                </entry>
+                                <entry>
+                                    <code>{"bool" : {"must" : {"range" : {"price" : {"from" :
+                                        null,"to" : ?,"include_lower" : true,"include_upper" :
+                                        true}}}}}
+                                    </code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>GreaterThanEqual</code>
+                                </entry>
+                                <entry>
+                                    <code>findByPriceGreaterThan</code>
+                                </entry>
+                                <entry>
+                                    <code>{"bool" : {"must" : {"range" : {"price" : {"from" :
+                                        ?,"to" : null,"include_lower" : true,"include_upper" :
+                                        true}}}}}
+                                    </code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>Before</code>
+                                </entry>
+                                <entry>
+                                    <code>findByPriceBefore</code>
+                                </entry>
+                                <entry>
+                                    <code>{"bool" : {"must" : {"range" : {"price" : {"from" :
+                                        null,"to" : ?,"include_lower" : true,"include_upper" :
+                                        true}}}}}
+                                    </code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>After</code>
+                                </entry>
+                                <entry>
+                                    <code>findByPriceAfter</code>
+                                </entry>
+                                <entry>
+                                    <code>{"bool" : {"must" : {"range" : {"price" : {"from" :
+                                        ?,"to" : null,"include_lower" : true,"include_upper" :
+                                        true}}}}}
+                                    </code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>Like</code>
+                                </entry>
+                                <entry>
+                                    <code>findByNameLike</code>
+                                </entry>
+                                <entry>
+                                    <code>{"bool" : {"must" : {"field" : {"name" : {"query" :
+                                        "?*","analyze_wildcard" : true}}}}}
+                                    </code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>StartingWith</code>
+                                </entry>
+                                <entry>
+                                    <code>findByNameStartingWith</code>
+                                </entry>
+                                <entry>
+                                    <code>{"bool" : {"must" : {"field" : {"name" : {"query" :
+                                        "?*","analyze_wildcard" : true}}}}}
+                                    </code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>EndingWith</code>
+                                </entry>
+                                <entry>
+                                    <code>findByNameEndingWith</code>
+                                </entry>
+                                <entry>
+                                    <code>{"bool" : {"must" : {"field" : {"name" : {"query" :
+                                        "*?","analyze_wildcard" : true}}}}}
+                                    </code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>Contains/Containing</code>
+                                </entry>
+                                <entry>
+                                    <code>findByNameContaining</code>
+                                </entry>
+                                <entry>
+                                    <code>{"bool" : {"must" : {"field" : {"name" : {"query" :
+                                        "*?*","analyze_wildcard" : true}}}}}
+                                    </code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>In</code>
+                                </entry>
+                                <entry>
+                                    <code>findByNameIn(Collection&lt;String&gt;names)</code>
+                                </entry>
+                                <entry>
+                                    <code>{"bool" : {"must" : {"bool" : {"should" : [ {"field" :
+                                        {"name" : "?"}}, {"field" : {"name" : "?"}} ]}}}}
+                                    </code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>NotIn</code>
+                                </entry>
+                                <entry>
+                                    <code>findByNameNotIn(Collection&lt;String&gt;names)</code>
+                                </entry>
+                                <entry>
+                                    <code>{"bool" : {"must_not" : {"bool" : {"should" : {"field" :
+                                        {"name" : "?"}}}}}}
+                                    </code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>Near</code>
+                                </entry>
+                                <entry>
+                                    <code>findByStoreNear</code>
+                                </entry>
+                                <entry>
+                                    <code>Not Supported Yet !</code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>True</code>
+                                </entry>
+                                <entry>
+                                    <code>findByAvailableTrue</code>
+                                </entry>
+                                <entry>
+                                    <code>{"bool" : {"must" : {"field" : {"available" : true}}}}
+                                    </code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>False</code>
+                                </entry>
+                                <entry>
+                                    <code>findByAvailableFalse</code>
+                                </entry>
+                                <entry>
+                                    <code>{"bool" : {"must" : {"field" : {"available" : false}}}}
+                                    </code>
+                                </entry>
+                            </row>
+                            <row>
+                                <entry>
+                                    <code>OrderBy</code>
+                                </entry>
+                                <entry>
+                                    <code>findByAvailableTrueOrderByNameDesc</code>
+                                </entry>
+                                <entry>
+                                    <code>{"sort" : [{ "name" : {"order" : "desc"} }],"bool" :
+                                        {"must" : {"field" : {"available" : true}}}}
+                                    </code>
+                                </entry>
+                            </row>
+                        </tbody>
+                    </tgroup>
+                </table>
+            </para>
+        </section>
+        <section id="elasticsearch.query-methods.at-query">
+            <title>Using @Query Annotation</title>
+            <example>
+                <title>
+                    Declare query at the method using the
+                    <interfacename>@Query</interfacename>
+                    annotation.
+                </title>
+
+                <programlisting language="java">public interface BookRepository extends ElasticsearchRepository&lt;Book,
+                    String&gt; {
+                    @Query("{"bool" : {"must" : {"field" : {"name" : "?0"}}}}")
+                    Page&lt;Book&gt; findByName(String name,Pageable pageable);
+                    }
+                </programlisting>
+            </example>
+        </section>
+
+    </section>
+
+
+</chapter>

src/docbkx/reference/elasticsearch-misc.xml

@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN"
+        "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<chapter id="elasticsearch.misc">
+    <title>Miscellaneous Elasticsearch Operation Support</title>
+    <abstract>
+        <para>
+            This chapter covers additional support for Elasticsearch operations
+            that cannot be directly accessed via the repository
+            interface.
+            It is
+            recommended to add those operations as custom
+            implementation as
+            described in
+            <xref linkend="repositories.custom-implementations"/>
+            .
+        </para>
+    </abstract>
+    <section id="elasticsearch.misc.filter">
+        <title>Filter Builder</title>
+        <para>
+            Filter Builder improves query speed.
+        </para>
+        <example>
+            <programlisting language="java">
+                private ElasticsearchTemplate elasticsearchTemplate;
+                SearchQuery searchQuery = new NativeSearchQueryBuilder()
+                .withQuery(matchAllQuery())
+                .withFilter(boolFilter().must(termFilter("id", documentId)))
+                .build();
+                Page&lt;SampleEntity&gt; sampleEntities =
+                elasticsearchTemplate.queryForPage(searchQuery,SampleEntity.class);
+            </programlisting>
+        </example>
+    </section>
+    <section id="elasticsearch.scan.and.scroll">
+        <title>Using Scan And Scroll For Big Result Set</title>
+        <para>
+            Elasticsearch has scan and scroll feature for getting big result set
+            in chunks.
+            <interfacename>ElasticsearchTemplate</interfacename>
+            has scan and scroll methods that can be used as below.
+        </para>
+        <example>
+            <title>
+                Using Scan and Scroll
+            </title>
+            <programlisting language="java">
+                SearchQuery searchQuery = new NativeSearchQueryBuilder()
+                .withQuery(matchAllQuery())
+                .withIndices("test-index")
+                .withTypes("test-type")
+                .withPageable(new PageRequest(0,1))
+                .build();
+                String scrollId = elasticsearchTemplate.scan(searchQuery,1000,false);
+                List&lt;SampleEntity&gt; sampleEntities = new ArrayList&lt;SampleEntity&gt;();
+                boolean hasRecords = true;
+                while (hasRecords){
+                Page&lt;SampleEntity&gt; page = elasticsearchTemplate.scroll(scrollId, 5000L , new ResultsMapper&lt;SampleEntity&gt;()
+                {
+                @Override
+                public Page&lt;SampleEntity&gt; mapResults(SearchResponse response) {
+                List&lt;SampleEntity&gt; chunk = new ArrayList&lt;SampleEntity&gt;();
+                for(SearchHit searchHit : response.getHits()){
+                if(response.getHits().getHits().length &lt;= 0) {
+                return null;
+                }
+                SampleEntity user = new SampleEntity();
+                user.setId(searchHit.getId());
+                user.setMessage((String)searchHit.getSource().get("message"));
+                chunk.add(user);
+                }
+                return new PageImpl&lt;SampleEntity&gt;(chunk);
+                }
+                });
+                if(page != null) {
+                sampleEntities.addAll(page.getContent());
+                hasRecords = page.hasNextPage();
+                }
+                else{
+                hasRecords = false;
+                }
+                }
+                }
+            </programlisting>
+        </example>
+    </section>
+</chapter>

src/main/asciidoc/index.adoc

@@ -1,36 +0,0 @@
-= Spring Data Elasticsearch
-BioMed Central Development Team
-:revnumber: {version}
-:revdate: {localdate}
-:toc:
-:toc-placement!:
-:spring-data-commons-docs: ../../../../spring-data-commons/src/main/asciidoc
-
-(C) 2013-2015 The original author(s).
-
-NOTE: Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each copy contains this Copyright Notice, whether distributed in print or electronically.
-
-toc::[]
-
-include::preface.adoc[]
-:leveloffset: +1
-include::{spring-data-commons-docs}/repositories.adoc[]
-:leveloffset: -1
-
-[[reference]]
-= Reference Documentation
-
-:leveloffset: +1
-include::reference/data-elasticsearch.adoc[]
-include::reference/elasticsearch-misc.adoc[]
-:leveloffset: -1
-
-[[appendix]]
-= Appendix
-:numbered!:
-:leveloffset: +1
-include::{spring-data-commons-docs}/repository-namespace-reference.adoc[]
-include::{spring-data-commons-docs}/repository-populator-namespace-reference.adoc[]
-include::{spring-data-commons-docs}/repository-query-keywords-reference.adoc[]
-include::{spring-data-commons-docs}/repository-query-return-types-reference.adoc[]
-:leveloffset: -1

src/main/asciidoc/preface.adoc

@@ -1,20 +0,0 @@
-= 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.
-
-[[project]]
-[preface]
-== Project Metadata
-
-* Version Control - https://github.com/spring-projects/spring-data-elasticsearch
-* 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]
-== Requirements
-
-Requires http://www.elasticsearch.org/download/[Elasticsearch] 0.20.2 and above or optional dependency or not even that if you are using Embedded Node 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
-http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-http://www.springframework.org/schema/data/elasticsearch
-http://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
-http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-http://www.springframework.org/schema/data/elasticsearch
-http://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
-http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
-http://www.springframework.org/schema/data/elasticsearch
-http://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-misc.adoc

@@ -1,72 +0,0 @@
-[[elasticsearch.misc]]
-= Miscellaneous Elasticsearch Operation Support
-
-This chapter covers additional support for Elasticsearch operations that cannot be directly accessed via the repository interface. It is recommended to add those operations as custom implementation as described in <<repositories.custom-implementations>> .
-
-[[elasticsearch.misc.filter]]
-== Filter Builder
-
-Filter Builder improves query speed.
-
-====
-[source,java]
-----
-private ElasticsearchTemplate elasticsearchTemplate;
-
-SearchQuery searchQuery = new NativeSearchQueryBuilder()
-    .withQuery(matchAllQuery())
-    .withFilter(boolFilter().must(termFilter("id", documentId)))
-    .build();
-    
-Page<SampleEntity> sampleEntities =
-    elasticsearchTemplate.queryForPage(searchQuery,SampleEntity.class);            
-----
-====
-
-[[elasticsearch.scan.and.scroll]]
-== Using Scan And Scroll For Big Result Set
-
-Elasticsearch has scan and scroll feature for getting big result set in chunks. `ElasticsearchTemplate` has scan and scroll methods that can be used as below.
-
-.Using Scan and Scroll
-====
-[source,java]
-----
-SearchQuery searchQuery = new NativeSearchQueryBuilder()
-    .withQuery(matchAllQuery())
-    .withIndices("test-index")
-    .withTypes("test-type")
-    .withPageable(new PageRequest(0,1))
-    .build();
-String scrollId = elasticsearchTemplate.scan(searchQuery,1000,false);
-List<SampleEntity> sampleEntities = new ArrayList<SampleEntity>();
-boolean hasRecords = true;
-while (hasRecords){
-    Page<SampleEntity> page = elasticsearchTemplate.scroll(scrollId, 5000L , new ResultsMapper<SampleEntity>()
-    {
-        @Override
-        public Page<SampleEntity> mapResults(SearchResponse response) {
-            List<SampleEntity> chunk = new ArrayList<SampleEntity>();
-            for(SearchHit searchHit : response.getHits()){
-                if(response.getHits().getHits().length <= 0) {
-                    return null;
-                }
-                SampleEntity user = new SampleEntity();
-                user.setId(searchHit.getId());
-                user.setMessage((String)searchHit.getSource().get("message"));
-                chunk.add(user);
-            }
-            return new PageImpl<SampleEntity>(chunk);
-        }
-    });
-    if(page != null) {
-        sampleEntities.addAll(page.getContent());
-        hasRecords = page.hasNextPage();
-    }
-    else{
-        hasRecords = false;
-    }
-    }
-}            
-----
-====

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

@@ -1,40 +0,0 @@
-/*
- * Copyright 2013 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
- *
- *      http://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.annotations;
-
-import java.lang.annotation.*;
-
-/**
- * Based on the reference doc - http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-suggesters-completion.html
- *
- * @author Mewes Kochheim
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-@Documented
-@Inherited
-public @interface CompletionField {
-
-	String searchAnalyzer() default "simple";
-
-	String analyzer() default "simple";
-
-	boolean preserveSeparators() default true;
-
-	boolean preservePositionIncrements() default true;
-
-	int maxInputLength() default 50;
-}

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

@@ -24,7 +24,6 @@ import org.springframework.data.annotation.Persistent;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Mason Chan
  */
 
 @Persistent
@@ -37,8 +36,6 @@ public @interface Document {
 
 	String type() default "";
 
-	boolean useServerConfiguration() default false;
-
 	short shards() default 5;
 
 	short replicas() default 1;
@@ -46,6 +43,4 @@ public @interface Document {
 	String refreshInterval() default "1s";
 
 	String indexStoreType() default "fs";
-
-	boolean createIndex() default true;
 }

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

@@ -15,12 +15,7 @@
  */
 package org.springframework.data.elasticsearch.annotations;
 
-import java.lang.annotation.Documented;
-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 java.lang.annotation.*;
 
 /**
  * @author Rizwan Idrees
@@ -28,17 +23,15 @@ import java.lang.annotation.Target;
  * @author Artur Konczak
  * @author Jonathan Yan
  * @author Jakub Vavrik
- * @author Kevin Leturc
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
 @Documented
-@Inherited
 public @interface Field {
 
 	FieldType type() default FieldType.Auto;
 
-	boolean index() default true;
+	FieldIndex index() default FieldIndex.analyzed;
 
 	DateFormat format() default DateFormat.none;
 
@@ -46,13 +39,9 @@ public @interface Field {
 
 	boolean store() default false;
 
-	boolean fielddata() default false;
-
 	String searchAnalyzer() default "";
 
-	String analyzer() default "";
+	String indexAnalyzer() default "";
 
 	String[] ignoreFields() default {};
-
-	boolean includeInParent() default false;
 }

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

@@ -18,9 +18,7 @@ package org.springframework.data.elasticsearch.annotations;
 /**
  * @author Artur Konczak
  * @author Mohsin Husen
- * @author Alexander Volz
- * @author Dennis Maaß
  */
 public enum FieldIndex {
-	not_analyzed, analyzed, no
+	not_analyzed, analyzed
 }

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

@@ -21,5 +21,5 @@ package org.springframework.data.elasticsearch.annotations;
  * @author Artur Konczak
  */
 public enum FieldType {
-	text, Integer, Long, Date, Float, Double, Boolean, Object, Auto, Nested, Ip, Attachment, keyword
+	String, Integer, Long, Date, Float, Double, Boolean, Object, Auto, Nested, Ip
 }

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

@@ -26,7 +26,7 @@ import org.springframework.data.annotation.Persistent;
 @Persistent
 @Inherited
 @Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE, ElementType.FIELD})
+@Target({ElementType.TYPE})
 public @interface Mapping {
 
 	String mappingPath() default "";

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

@@ -30,5 +30,5 @@ public @interface MultiField {
 
 	public Field mainField();
 
-	public InnerField[] otherFields() default {};
+	public NestedField[] otherFields() default {};
 }

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

@@ -25,18 +25,16 @@ import java.lang.annotation.Target;
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
-public @interface InnerField {
+public @interface NestedField {
 
-	String suffix();
+	String dotSuffix();
 
 	FieldType type();
 
-	boolean index() default true;
+	FieldIndex index() default FieldIndex.analyzed;
 
 	boolean store() default false;
 
-	boolean fielddata() default false;
-
 	String searchAnalyzer() default "";
 
 	String indexAnalyzer() default "";

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

@@ -1,19 +0,0 @@
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.*;
-
-/**
- * @author Ryan Murfitt
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-@Documented
-public @interface ScriptedField {
-
-    /**
-     * (Optional) The name of the scripted field. Defaults to
-     * the field name.
-     */
-    String name() default "";
-
-}

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

@@ -1,144 +1,98 @@
-/*
- * Copyright 2015-2017 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
- *
- *      http://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.client;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collection;
-import org.apache.commons.lang.StringUtils;
-import org.elasticsearch.client.Client;
-import org.elasticsearch.client.node.NodeClient;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.node.InternalSettingsPreparer;
-import org.elasticsearch.node.Node;
-import org.elasticsearch.plugins.Plugin;
-import org.elasticsearch.transport.Netty4Plugin;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-import static java.util.Arrays.*;
-
-/**
- * NodeClientFactoryBean
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public class NodeClientFactoryBean implements FactoryBean<Client>, InitializingBean, DisposableBean {
-
-	private static final Logger logger = LoggerFactory.getLogger(NodeClientFactoryBean.class);
-	private boolean local;
-	private boolean enableHttp;
-	private String clusterName;
-	private NodeClient nodeClient;
-	private String pathData;
-	private String pathHome;
-	private String pathConfiguration;
-
-	public static class TestNode extends Node {
-		public TestNode(Settings preparedSettings, Collection<Class<? extends Plugin>> classpathPlugins) {
-			super(InternalSettingsPreparer.prepareEnvironment(preparedSettings, null), classpathPlugins);
-		}
-	}
-
-	NodeClientFactoryBean() {
-	}
-
-	public NodeClientFactoryBean(boolean local) {
-		this.local = local;
-	}
-
-	@Override
-	public NodeClient getObject() throws Exception {
-		return nodeClient;
-	}
-
-	@Override
-	public Class<? extends Client> getObjectType() {
-		return NodeClient.class;
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-
-		nodeClient = (NodeClient) new TestNode(
-				Settings.builder().put(loadConfig())
-						.put("transport.type", "netty4")
-						.put("transport.type", "local")
-						.put("http.type", "netty4")
-						.put("path.home", this.pathHome)
-						.put("path.data", this.pathData)
-						.put("cluster.name", this.clusterName)
-						.put("node.max_local_storage_nodes", 100)
-						.put("script.inline", "true")
-						.build(), asList(Netty4Plugin.class)).start().client();
-	}
-
-	private Settings loadConfig() throws IOException {
-		if (StringUtils.isNotBlank(pathConfiguration)) {
-			InputStream stream = getClass().getClassLoader().getResourceAsStream(pathConfiguration);
-			if (stream != null) {
-				return Settings.builder().loadFromStream(pathConfiguration, getClass().getClassLoader().getResourceAsStream(pathConfiguration)).build();
-			}
-			logger.error(String.format("Unable to read node configuration from file [%s]", pathConfiguration));
-		}
-		return Settings.builder().build();
-	}
-
-	public void setLocal(boolean local) {
-		this.local = local;
-	}
-
-	public void setEnableHttp(boolean enableHttp) {
-		this.enableHttp = enableHttp;
-	}
-
-	public void setClusterName(String clusterName) {
-		this.clusterName = clusterName;
-	}
-
-	public void setPathData(String pathData) {
-		this.pathData = pathData;
-	}
-
-	public void setPathHome(String pathHome) {
-		this.pathHome = pathHome;
-	}
-
-	public void setPathConfiguration(String configuration) {
-		this.pathConfiguration = configuration;
-	}
-
-	@Override
-	public void destroy() throws Exception {
-		try {
-			logger.info("Closing elasticSearch  client");
-			if (nodeClient != null) {
-				nodeClient.close();
-			}
-		} catch (final Exception e) {
-			logger.error("Error closing ElasticSearch client: ", e);
-		}
-	}
-}
+/*
+ * Copyright 2013 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
+ *
+ *      http://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.client;
+
+import static org.elasticsearch.node.NodeBuilder.*;
+
+import org.elasticsearch.client.Client;
+import org.elasticsearch.client.node.NodeClient;
+import org.elasticsearch.common.settings.ImmutableSettings;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+
+/**
+ * NodeClientFactoryBean
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public class NodeClientFactoryBean implements FactoryBean<NodeClient>, InitializingBean, DisposableBean {
+
+	private static final Logger logger = LoggerFactory.getLogger(NodeClientFactoryBean.class);
+	private boolean local;
+	private boolean enableHttp;
+	private String clusterName;
+	private NodeClient nodeClient;
+
+	NodeClientFactoryBean() {
+	}
+
+	public NodeClientFactoryBean(boolean local) {
+		this.local = local;
+	}
+
+	@Override
+	public NodeClient getObject() throws Exception {
+		return nodeClient;
+	}
+
+	@Override
+	public Class<? extends Client> getObjectType() {
+		return NodeClient.class;
+	}
+
+	@Override
+	public boolean isSingleton() {
+		return true;
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		ImmutableSettings.Builder settings = ImmutableSettings.settingsBuilder().put("http.enabled",
+				String.valueOf(this.enableHttp));
+
+		nodeClient = (NodeClient) nodeBuilder().settings(settings).clusterName(this.clusterName).local(this.local).node()
+				.client();
+	}
+
+	public void setLocal(boolean local) {
+		this.local = local;
+	}
+
+	public void setEnableHttp(boolean enableHttp) {
+		this.enableHttp = enableHttp;
+	}
+
+	public void setClusterName(String clusterName) {
+		this.clusterName = clusterName;
+	}
+
+	@Override
+	public void destroy() throws Exception {
+		try {
+			logger.info("Closing elasticSearch  client");
+			if (nodeClient != null) {
+				nodeClient.close();
+			}
+		} catch (final Exception e) {
+			logger.error("Error closing ElasticSearch client: ", e);
+		}
+	}
+}

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

@@ -16,14 +16,13 @@
 package org.springframework.data.elasticsearch.client;
 
 import static org.apache.commons.lang.StringUtils.*;
+import static org.elasticsearch.common.settings.ImmutableSettings.*;
 
-import java.net.InetAddress;
 import java.util.Properties;
 
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
-import org.elasticsearch.transport.client.PreBuiltTransportClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
@@ -87,25 +86,24 @@ public class TransportClientFactoryBean implements FactoryBean<TransportClient>,
 	}
 
 	protected void buildClient() throws Exception {
-
-		client = new PreBuiltTransportClient(settings());
+		client = new TransportClient(settings());
 		Assert.hasText(clusterNodes, "[Assertion failed] clusterNodes settings missing.");
 		for (String clusterNode : split(clusterNodes, COMMA)) {
-			String hostName = substringBeforeLast(clusterNode, COLON);
-			String port = substringAfterLast(clusterNode, COLON);
+			String hostName = substringBefore(clusterNode, COLON);
+			String port = substringAfter(clusterNode, COLON);
 			Assert.hasText(hostName, "[Assertion failed] missing host name in 'clusterNodes'");
 			Assert.hasText(port, "[Assertion failed] missing port in 'clusterNodes'");
 			logger.info("adding transport node : " + clusterNode);
-			client.addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(hostName), Integer.valueOf(port)));
+			client.addTransportAddress(new InetSocketTransportAddress(hostName, Integer.valueOf(port)));
 		}
 		client.connectedNodes();
 	}
 
 	private Settings settings() {
 		if (properties != null) {
-			return Settings.builder().put(properties).build();
+			return settingsBuilder().put(properties).build();
 		}
-		return Settings.builder()
+		return settingsBuilder()
 				.put("cluster.name", clusterName)
 				.put("client.transport.sniff", clientTransportSniff)
 				.put("client.transport.ignore_cluster_name", clientIgnoreClusterName)

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

@@ -1,57 +1,54 @@
-/*
- * Copyright 2015 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
- *
- * http://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.config;
-
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.elasticsearch.client.NodeClientFactoryBean;
-import org.w3c.dom.Element;
-
-/**
- * NodeClientBeanDefinitionParser
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public class NodeClientBeanDefinitionParser extends AbstractBeanDefinitionParser {
-
-	@Override
-	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(NodeClientFactoryBean.class);
-		setLocalSettings(element, builder);
-		return getSourcedBeanDefinition(builder, element, parserContext);
-	}
-
-	private void setLocalSettings(Element element, BeanDefinitionBuilder builder) {
-		builder.addPropertyValue("local", Boolean.valueOf(element.getAttribute("local")));
-		builder.addPropertyValue("clusterName", element.getAttribute("cluster-name"));
-		builder.addPropertyValue("enableHttp", Boolean.valueOf(element.getAttribute("http-enabled")));
-		builder.addPropertyValue("pathData", element.getAttribute("path-data"));
-		builder.addPropertyValue("pathHome", element.getAttribute("path-home"));
-		builder.addPropertyValue("pathConfiguration", element.getAttribute("path-configuration"));
-	}
-
-	private AbstractBeanDefinition getSourcedBeanDefinition(BeanDefinitionBuilder builder, Element source,
-															ParserContext context) {
-		AbstractBeanDefinition definition = builder.getBeanDefinition();
-		definition.setSource(context.extractSource(source));
-		return definition;
-	}
-}
+/*
+ * Copyright 2013 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
+ *
+ * http://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.config;
+
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.elasticsearch.client.NodeClientFactoryBean;
+import org.w3c.dom.Element;
+
+/**
+ * NodeClientBeanDefinitionParser
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public class NodeClientBeanDefinitionParser extends AbstractBeanDefinitionParser {
+
+	@Override
+	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(NodeClientFactoryBean.class);
+		setLocalSettings(element, builder);
+		return getSourcedBeanDefinition(builder, element, parserContext);
+	}
+
+	private void setLocalSettings(Element element, BeanDefinitionBuilder builder) {
+		builder.addPropertyValue("local", Boolean.valueOf(element.getAttribute("local")));
+		builder.addPropertyValue("clusterName", element.getAttribute("cluster-name"));
+		builder.addPropertyValue("enableHttp", Boolean.valueOf(element.getAttribute("http-enabled")));
+	}
+
+	private AbstractBeanDefinition getSourcedBeanDefinition(BeanDefinitionBuilder builder, Element source,
+															ParserContext context) {
+		AbstractBeanDefinition definition = builder.getBeanDefinition();
+		definition.setSource(context.extractSource(source));
+		return definition;
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013 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,6 +15,7 @@
  */
 package org.springframework.data.elasticsearch.core;
 
+import static org.elasticsearch.index.query.FilterBuilders.*;
 import static org.springframework.data.elasticsearch.core.query.Criteria.*;
 
 import java.util.Iterator;
@@ -22,45 +23,36 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.elasticsearch.common.geo.GeoDistance;
-import org.elasticsearch.index.query.*;
+import org.elasticsearch.index.query.FilterBuilder;
+import org.elasticsearch.index.query.GeoBoundingBoxFilterBuilder;
+import org.elasticsearch.index.query.GeoDistanceFilterBuilder;
 import org.springframework.data.elasticsearch.core.geo.GeoBox;
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
 import org.springframework.data.elasticsearch.core.query.Criteria;
-import org.springframework.data.geo.Box;
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.Metrics;
-import org.springframework.data.geo.Point;
 import org.springframework.util.Assert;
 
 /**
  * CriteriaFilterProcessor
  *
  * @author Franck Marchand
- * @author Mohsin Husen
- * @author Artur Konczak
- *
  */
 class CriteriaFilterProcessor {
 
 
-	QueryBuilder createFilterFromCriteria(Criteria criteria) {
-		List<QueryBuilder> fbList = new LinkedList<>();
-		QueryBuilder filter = null;
+	FilterBuilder createFilterFromCriteria(Criteria criteria) {
+		List<FilterBuilder> fbList = new LinkedList<FilterBuilder>();
+		FilterBuilder filter = null;
 
 		ListIterator<Criteria> chainIterator = criteria.getCriteriaChain().listIterator();
 
 		while (chainIterator.hasNext()) {
-			QueryBuilder fb = null;
+			FilterBuilder fb = null;
 			Criteria chainedCriteria = chainIterator.next();
 			if (chainedCriteria.isOr()) {
-				fb = QueryBuilders.boolQuery();
-				for(QueryBuilder f: createFilterFragmentForCriteria(chainedCriteria)){
-					((BoolQueryBuilder)fb).should(f);
-				}
+				fb = orFilter(createFilterFragmentForCriteria(chainedCriteria).toArray(new FilterBuilder[]{}));
 				fbList.add(fb);
 			} else if (chainedCriteria.isNegating()) {
-				List<QueryBuilder> negationFilters = buildNegationFilter(criteria.getField().getName(), criteria.getFilterCriteriaEntries().iterator());
+				List<FilterBuilder> negationFilters = buildNegationFilter(criteria.getField().getName(), criteria.getFilterCriteriaEntries().iterator());
 
 				if (!negationFilters.isEmpty()) {
 					fbList.addAll(negationFilters);
@@ -74,23 +66,21 @@ class CriteriaFilterProcessor {
 			if (fbList.size() == 1) {
 				filter = fbList.get(0);
 			} else {
-				filter = QueryBuilders.boolQuery();
-				for(QueryBuilder f: fbList) {
-					((BoolQueryBuilder)filter).must(f);
-				}
+				filter = andFilter(fbList.toArray(new FilterBuilder[]{}));
 			}
 		}
+
 		return filter;
 	}
 
 
-	private List<QueryBuilder> createFilterFragmentForCriteria(Criteria chainedCriteria) {
+	private List<FilterBuilder> createFilterFragmentForCriteria(Criteria chainedCriteria) {
 		Iterator<Criteria.CriteriaEntry> it = chainedCriteria.getFilterCriteriaEntries().iterator();
-		List<QueryBuilder> filterList = new LinkedList<>();
+		List<FilterBuilder> filterList = new LinkedList<FilterBuilder>();
 
 		String fieldName = chainedCriteria.getField().getName();
 		Assert.notNull(fieldName, "Unknown field");
-		QueryBuilder filter = null;
+		FilterBuilder filter = null;
 
 		while (it.hasNext()) {
 			Criteria.CriteriaEntry entry = it.next();
@@ -102,53 +92,42 @@ class CriteriaFilterProcessor {
 	}
 
 
-	private QueryBuilder processCriteriaEntry(OperationKey key, Object value, String fieldName) {
+	private FilterBuilder processCriteriaEntry(OperationKey key, Object value, String fieldName) {
 		if (value == null) {
 			return null;
 		}
-		QueryBuilder filter = null;
+		FilterBuilder filter = null;
 
 		switch (key) {
 			case WITHIN: {
-				GeoDistanceQueryBuilder geoDistanceQueryBuilder = QueryBuilders.geoDistanceQuery(fieldName);
+				filter = geoDistanceFilter(fieldName);
 
 				Assert.isTrue(value instanceof Object[], "Value of a geo distance filter should be an array of two values.");
 				Object[] valArray = (Object[]) value;
 				Assert.noNullElements(valArray, "Geo distance filter takes 2 not null elements array as parameter.");
 				Assert.isTrue(valArray.length == 2, "Geo distance filter takes a 2-elements array as parameter.");
-				Assert.isTrue(valArray[0] instanceof GeoPoint || valArray[0] instanceof String || valArray[0] instanceof Point, "First element of a geo distance filter must be a GeoPoint, a Point or a text");
-				Assert.isTrue(valArray[1] instanceof String || valArray[1] instanceof Distance, "Second element of a geo distance filter must be a text or a Distance");
-
-				StringBuilder dist = new StringBuilder();
-
-				if (valArray[1] instanceof Distance) {
-					extractDistanceString((Distance) valArray[1], dist);
-				} else {
-					dist.append((String) valArray[1]);
-				}
+				Assert.isTrue(valArray[0] instanceof GeoPoint || valArray[0] instanceof String, "First element of a geo distance filter must be a GeoLocation or String");
+				Assert.isTrue(valArray[1] instanceof String, "Second element of a geo distance filter must be a String");
 
+				String dist = (String) valArray[1];
 				if (valArray[0] instanceof GeoPoint) {
 					GeoPoint loc = (GeoPoint) valArray[0];
-					geoDistanceQueryBuilder.point(loc.getLat(),loc.getLon()).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
-				} else if (valArray[0] instanceof Point) {
-					GeoPoint loc = GeoPoint.fromPoint((Point) valArray[0]);
-					geoDistanceQueryBuilder.point(loc.getLat(), loc.getLon()).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
+					((GeoDistanceFilterBuilder) filter).lat(loc.getLat()).lon(loc.getLon()).distance(dist);
 				} else {
 					String loc = (String) valArray[0];
 					if (loc.contains(",")) {
 						String c[] = loc.split(",");
-						geoDistanceQueryBuilder.point(Double.parseDouble(c[0]), Double.parseDouble(c[1])).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
+						((GeoDistanceFilterBuilder) filter).lat(Double.parseDouble(c[0])).lon(Double.parseDouble(c[1])).distance(dist);
 					} else {
-						geoDistanceQueryBuilder.geohash(loc).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
+						((GeoDistanceFilterBuilder) filter).geohash(loc).distance(dist);
 					}
 				}
-				filter = geoDistanceQueryBuilder;
 
 				break;
 			}
 
 			case BBOX: {
-				filter = QueryBuilders.geoBoundingBoxQuery(fieldName);
+				filter = geoBoundingBoxFilter(fieldName);
 
 				Assert.isTrue(value instanceof Object[], "Value of a boundedBy filter should be an array of one or two values.");
 				Object[] valArray = (Object[]) value;
@@ -156,11 +135,11 @@ class CriteriaFilterProcessor {
 
 				if (valArray.length == 1) {
 					//GeoEnvelop
-					oneParameterBBox((GeoBoundingBoxQueryBuilder) filter, valArray[0]);
+					oneParameterBBox((GeoBoundingBoxFilterBuilder) filter, valArray[0]);
 				} else if (valArray.length == 2) {
 					//2x GeoPoint
-					//2x text
-					twoParameterBBox((GeoBoundingBoxQueryBuilder) filter, valArray);
+					//2x String
+					twoParameterBBox((GeoBoundingBoxFilterBuilder) filter, valArray);
 				} else {
 					//error
 					Assert.isTrue(false, "Geo distance filter takes a 1-elements array(GeoBox) or 2-elements array(GeoPoints or Strings(format lat,lon or geohash)).");
@@ -172,41 +151,11 @@ class CriteriaFilterProcessor {
 		return filter;
 	}
 
-
-	/**
-	 * extract the distance string from a {@link org.springframework.data.geo.Distance} object.
-	 *
-	 * @param distance distance object to extract string from
-	 * @param sb StringBuilder to build the distance string
-	 */
-	private void extractDistanceString(Distance distance, StringBuilder sb) {
-		// handle Distance object
-		sb.append((int) distance.getValue());
-
-		Metrics metric = (Metrics) distance.getMetric();
-
-		switch (metric) {
-			case KILOMETERS:
-				sb.append("km");
-				break;
-			case MILES:
-				sb.append("mi");
-				break;
-		}
-	}
-
-	private void oneParameterBBox(GeoBoundingBoxQueryBuilder filter, Object value) {
-		Assert.isTrue(value instanceof GeoBox || value instanceof Box, "single-element of boundedBy filter must be type of GeoBox or Box");
-
-		GeoBox geoBBox;
-		if (value instanceof Box) {
-			Box sdbox = (Box) value;
-			geoBBox = GeoBox.fromBox(sdbox);
-		} else {
-			geoBBox = (GeoBox) value;
-		}
-
-		filter.setCorners(geoBBox.getTopLeft().getLat(), geoBBox.getTopLeft().getLon(), geoBBox.getBottomRight().getLat(), geoBBox.getBottomRight().getLon());
+	private void oneParameterBBox(GeoBoundingBoxFilterBuilder filter, Object value) {
+		Assert.isTrue(value instanceof GeoBox, "single-element of boundedBy filter must be type of GeoBox");
+		GeoBox geoBBox = (GeoBox) value;
+		filter.topLeft(geoBBox.getTopLeft().getLat(), geoBBox.getTopLeft().getLon());
+		filter.bottomRight(geoBBox.getBottomRight().getLat(), geoBBox.getBottomRight().getLon());
 	}
 
 	private static boolean isType(Object[] array, Class clazz) {
@@ -218,25 +167,27 @@ class CriteriaFilterProcessor {
 		return true;
 	}
 
-	private void twoParameterBBox(GeoBoundingBoxQueryBuilder filter, Object[] values) {
-		Assert.isTrue(isType(values, GeoPoint.class) || isType(values, String.class), " both elements of boundedBy filter must be type of GeoPoint or text(format lat,lon or geohash)");
+	private void twoParameterBBox(GeoBoundingBoxFilterBuilder filter, Object[] values) {
+		Assert.isTrue(isType(values, GeoPoint.class) || isType(values, String.class), " both elements of boundedBy filter must be type of GeoPoint or String(format lat,lon or geohash)");
 		if (values[0] instanceof GeoPoint) {
 			GeoPoint topLeft = (GeoPoint) values[0];
 			GeoPoint bottomRight = (GeoPoint) values[1];
-			filter.setCorners(topLeft.getLat(), topLeft.getLon(), bottomRight.getLat(), bottomRight.getLon());
+			filter.topLeft(topLeft.getLat(), topLeft.getLon());
+			filter.bottomRight(bottomRight.getLat(), bottomRight.getLon());
 		} else {
 			String topLeft = (String) values[0];
 			String bottomRight = (String) values[1];
-			filter.setCorners(topLeft, bottomRight);
+			filter.topLeft(topLeft);
+			filter.bottomRight(bottomRight);
 		}
 	}
 
-	private List<QueryBuilder> buildNegationFilter(String fieldName, Iterator<Criteria.CriteriaEntry> it) {
-		List<QueryBuilder> notFilterList = new LinkedList<>();
+	private List<FilterBuilder> buildNegationFilter(String fieldName, Iterator<Criteria.CriteriaEntry> it) {
+		List<FilterBuilder> notFilterList = new LinkedList<FilterBuilder>();
 
 		while (it.hasNext()) {
 			Criteria.CriteriaEntry criteriaEntry = it.next();
-			QueryBuilder notFilter = QueryBuilders.boolQuery().mustNot(processCriteriaEntry(criteriaEntry.getKey(), criteriaEntry.getValue(), fieldName));
+			FilterBuilder notFilter = notFilter(processCriteriaEntry(criteriaEntry.getKey(), criteriaEntry.getValue(), fieldName));
 			notFilterList.add(notFilter);
 		}
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013 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,7 +15,6 @@
  */
 package org.springframework.data.elasticsearch.core;
 
-import static org.elasticsearch.index.query.Operator.AND;
 import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.springframework.data.elasticsearch.core.query.Criteria.*;
 
@@ -25,7 +24,9 @@ import java.util.List;
 import java.util.ListIterator;
 
 import org.apache.lucene.queryparser.flexible.core.util.StringUtils;
-import org.elasticsearch.index.query.*;
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.BoostableQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilder;
 import org.springframework.data.elasticsearch.core.query.Criteria;
 import org.springframework.util.Assert;
 
@@ -35,7 +36,6 @@ import org.springframework.util.Assert;
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Franck Marchand
- * @author Artur Konczak
  */
 class CriteriaQueryProcessor {
 
@@ -44,24 +44,16 @@ class CriteriaQueryProcessor {
 		if (criteria == null)
 			return null;
 
-		List<QueryBuilder> shouldQueryBuilderList = new LinkedList<>();
-		List<QueryBuilder> mustNotQueryBuilderList = new LinkedList<>();
-		List<QueryBuilder> mustQueryBuilderList = new LinkedList<>();
+		List<QueryBuilder> shouldQueryBuilderList = new LinkedList<QueryBuilder>();
+		List<QueryBuilder> mustNotQueryBuilderList = new LinkedList<QueryBuilder>();
+		List<QueryBuilder> mustQueryBuilderList = new LinkedList<QueryBuilder>();
 
 		ListIterator<Criteria> chainIterator = criteria.getCriteriaChain().listIterator();
-
-		QueryBuilder firstQuery = null;
-		boolean negateFirstQuery = false;
-
 		while (chainIterator.hasNext()) {
 			Criteria chainedCriteria = chainIterator.next();
 			QueryBuilder queryFragmentForCriteria = createQueryFragmentForCriteria(chainedCriteria);
+
 			if (queryFragmentForCriteria != null) {
-				if (firstQuery == null) {
-					firstQuery = queryFragmentForCriteria;
-					negateFirstQuery = chainedCriteria.isNegating();
-					continue;
-				}
 				if (chainedCriteria.isOr()) {
 					shouldQueryBuilderList.add(queryFragmentForCriteria);
 				} else if (chainedCriteria.isNegating()) {
@@ -72,18 +64,6 @@ class CriteriaQueryProcessor {
 			}
 		}
 
-		if (firstQuery != null) {
-			if (!shouldQueryBuilderList.isEmpty() && mustNotQueryBuilderList.isEmpty() && mustQueryBuilderList.isEmpty()) {
-				shouldQueryBuilderList.add(0, firstQuery);
-			} else {
-				if (negateFirstQuery) {
-					mustNotQueryBuilderList.add(0, firstQuery);
-				} else {
-					mustQueryBuilderList.add(0, firstQuery);
-				}
-			}
-		}
-
 		BoolQueryBuilder query = null;
 
 		if (!shouldQueryBuilderList.isEmpty() || !mustNotQueryBuilderList.isEmpty() || !mustQueryBuilderList.isEmpty()) {
@@ -118,12 +98,12 @@ class CriteriaQueryProcessor {
 
 		if (singeEntryCriteria) {
 			Criteria.CriteriaEntry entry = it.next();
-			query = processCriteriaEntry(entry, fieldName);
+			query = processCriteriaEntry(entry.getKey(), entry.getValue(), fieldName);
 		} else {
 			query = boolQuery();
 			while (it.hasNext()) {
 				Criteria.CriteriaEntry entry = it.next();
-				((BoolQueryBuilder) query).must(processCriteriaEntry(entry, fieldName));
+				((BoolQueryBuilder) query).must(processCriteriaEntry(entry.getKey(), entry.getValue(), fieldName));
 			}
 		}
 
@@ -132,68 +112,46 @@ class CriteriaQueryProcessor {
 	}
 
 
-	private QueryBuilder processCriteriaEntry(Criteria.CriteriaEntry entry,/* OperationKey key, Object value,*/ String fieldName) {
-		Object value = entry.getValue();
+	private QueryBuilder processCriteriaEntry(OperationKey key, Object value, String fieldName) {
 		if (value == null) {
 			return null;
 		}
-		OperationKey key = entry.getKey();
 		QueryBuilder query = null;
 
 		String searchText = StringUtils.toString(value);
 
-		Iterable<Object> collection = null;
-
 		switch (key) {
 			case EQUALS:
-				query = queryStringQuery(searchText).field(fieldName).defaultOperator(AND);
+				query = queryString(searchText).field(fieldName);
 				break;
 			case CONTAINS:
-				query = queryStringQuery("*" + searchText + "*").field(fieldName).analyzeWildcard(true);
+				query = queryString("*" + searchText + "*").field(fieldName).analyzeWildcard(true);
 				break;
 			case STARTS_WITH:
-				query = queryStringQuery(searchText + "*").field(fieldName).analyzeWildcard(true);
+				query = queryString(searchText + "*").field(fieldName).analyzeWildcard(true);
 				break;
 			case ENDS_WITH:
-				query = queryStringQuery("*" + searchText).field(fieldName).analyzeWildcard(true);
+				query = queryString("*" + searchText).field(fieldName).analyzeWildcard(true);
 				break;
 			case EXPRESSION:
-				query = queryStringQuery(searchText).field(fieldName);
-				break;
-			case LESS_EQUAL:
-				query = rangeQuery(fieldName).lte(value);
-				break;
-			case GREATER_EQUAL:
-				query = rangeQuery(fieldName).gte(value);
+				query = queryString((String) value).field(fieldName);
 				break;
 			case BETWEEN:
 				Object[] ranges = (Object[]) value;
 				query = rangeQuery(fieldName).from(ranges[0]).to(ranges[1]);
 				break;
-			case LESS:
-				query = rangeQuery(fieldName).lt(value);
-				break;
-			case GREATER:
-				query = rangeQuery(fieldName).gt(value);
-				break;
 			case FUZZY:
-				query = fuzzyQuery(fieldName, searchText);
+				query = fuzzyQuery(fieldName, (String) value);
 				break;
 			case IN:
 				query = boolQuery();
-				collection = (Iterable<Object>) value;
+				Iterable<Object> collection = (Iterable<Object>) value;
 				for (Object item : collection) {
-					((BoolQueryBuilder) query).should(queryStringQuery(item.toString()).field(fieldName));
-				}
-				break;
-			case NOT_IN:
-				query = boolQuery();
-				collection = (Iterable<Object>) value;
-				for (Object item : collection) {
-					((BoolQueryBuilder) query).mustNot(queryStringQuery(item.toString()).field(fieldName));
+					((BoolQueryBuilder) query).should(queryString((String) item).field(fieldName));
 				}
 				break;
 		}
+
 		return query;
 	}
 
@@ -201,6 +159,8 @@ class CriteriaQueryProcessor {
 		if (Float.isNaN(boost)) {
 			return;
 		}
-		query.boost(boost);
+		if (query instanceof BoostableQueryBuilder) {
+			((BoostableQueryBuilder) query).boost(boost);
+		}
 	}
 }

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

@@ -16,27 +16,9 @@
 package org.springframework.data.elasticsearch.core;
 
 import java.io.IOException;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.*;
-import com.fasterxml.jackson.databind.*;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.core.geo.CustomGeoModule;
-import org.springframework.data.geo.*;
-import java.util.List;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import com.fasterxml.jackson.databind.module.SimpleModule;
 
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * DocumentMapper using jackson
@@ -52,7 +34,6 @@ public class DefaultEntityMapper implements EntityMapper {
 		objectMapper = new ObjectMapper();
 		objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 		objectMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
-		objectMapper.registerModule(new CustomGeoModule());
 	}
 
 	@Override

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014 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,38 @@
  */
 package org.springframework.data.elasticsearch.core;
 
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.lang.reflect.Method;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.get.MultiGetItemResponse;
 import org.elasticsearch.action.get.MultiGetResponse;
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.common.base.Strings;
+import org.elasticsearch.common.jackson.core.JsonEncoding;
+import org.elasticsearch.common.jackson.core.JsonFactory;
+import org.elasticsearch.common.jackson.core.JsonGenerator;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHitField;
+import org.elasticsearch.search.facet.Facet;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.elasticsearch.ElasticsearchException;
 import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.ScriptedField;
-import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
-import org.springframework.data.elasticsearch.core.aggregation.impl.AggregatedPageImpl;
+import org.springframework.data.elasticsearch.core.facet.DefaultFacetMapper;
+import org.springframework.data.elasticsearch.core.facet.FacetResult;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
+import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.context.MappingContext;
 
-import com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
-
 /**
  * @author Artur Konczak
- * @author Petar Tahchiev
- * @author Young Gu
- * @author Oliver Gierke
- * @author Mark Paluch
  */
 public class DefaultResultMapper extends AbstractResultMapper {
 
@@ -68,55 +65,33 @@ public class DefaultResultMapper extends AbstractResultMapper {
 		super(entityMapper);
 	}
 
-	public DefaultResultMapper(
-			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext,
-			EntityMapper entityMapper) {
-		super(entityMapper);
-		this.mappingContext = mappingContext;
-	}
-
 	@Override
-	public <T> AggregatedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
+	public <T> FacetedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
 		long totalHits = response.getHits().totalHits();
-		List<T> results = new ArrayList<>();
+		List<T> results = new ArrayList<T>();
 		for (SearchHit hit : response.getHits()) {
 			if (hit != null) {
 				T result = null;
-				if (StringUtils.isNotBlank(hit.sourceAsString())) {
+				if (!Strings.isNullOrEmpty(hit.sourceAsString())) {
 					result = mapEntity(hit.sourceAsString(), clazz);
 				} else {
 					result = mapEntity(hit.getFields().values(), clazz);
 				}
 				setPersistentEntityId(result, hit.getId(), clazz);
-				populateScriptFields(result, hit);
 				results.add(result);
 			}
 		}
-
-        return new AggregatedPageImpl<T>(results, pageable, totalHits, response.getAggregations(), response.getScrollId());
-	}
-
-	private <T> void populateScriptFields(T result, SearchHit hit) {
-		if (hit.getFields() != null && !hit.getFields().isEmpty() && result != null) {
-			for (java.lang.reflect.Field field : result.getClass().getDeclaredFields()) {
-				ScriptedField scriptedField = field.getAnnotation(ScriptedField.class);
-				if (scriptedField != null) {
-					String name = scriptedField.name().isEmpty() ? field.getName() : scriptedField.name();
-					SearchHitField searchHitField = hit.getFields().get(name);
-					if (searchHitField != null) {
-						field.setAccessible(true);
-						try {
-							field.set(result, searchHitField.getValue());
-						} catch (IllegalArgumentException e) {
-							throw new ElasticsearchException("failed to set scripted field: " + name + " with value: "
-									+ searchHitField.getValue(), e);
-						} catch (IllegalAccessException e) {
-							throw new ElasticsearchException("failed to access scripted field: " + name, e);
-						}
-					}
+		List<FacetResult> facets = new ArrayList<FacetResult>();
+		if (response.getFacets() != null) {
+			for (Facet facet : response.getFacets()) {
+				FacetResult facetResult = DefaultFacetMapper.parse(facet);
+				if (facetResult != null) {
+					facets.add(facetResult);
 				}
 			}
 		}
+
+		return new FacetedPageImpl<T>(results, pageable, totalHits, facets);
 	}
 
 	private <T> T mapEntity(Collection<SearchHitField> values, Class<T> clazz) {
@@ -159,11 +134,10 @@ public class DefaultResultMapper extends AbstractResultMapper {
 
 	@Override
 	public <T> LinkedList<T> mapResults(MultiGetResponse responses, Class<T> clazz) {
-		LinkedList<T> list = new LinkedList<>();
+		LinkedList<T> list = new LinkedList<T>();
 		for (MultiGetItemResponse response : responses.getResponses()) {
 			if (!response.isFailed() && response.getResponse().isExists()) {
 				T result = mapEntity(response.getResponse().getSourceAsString(), clazz);
-				setPersistentEntityId(result, response.getResponse().getId(), clazz);
 				list.add(result);
 			}
 		}
@@ -171,17 +145,19 @@ public class DefaultResultMapper extends AbstractResultMapper {
 	}
 
 	private <T> void setPersistentEntityId(T result, String id, Class<T> clazz) {
-
 		if (mappingContext != null && clazz.isAnnotationPresent(Document.class)) {
-
-			ElasticsearchPersistentEntity<?> persistentEntity = mappingContext.getRequiredPersistentEntity(clazz);
-			ElasticsearchPersistentProperty idProperty = persistentEntity.getIdProperty();
-
+			PersistentProperty<ElasticsearchPersistentProperty> idProperty = mappingContext.getPersistentEntity(clazz).getIdProperty();
 			// Only deal with String because ES generated Ids are strings !
 			if (idProperty != null && idProperty.getType().isAssignableFrom(String.class)) {
-				persistentEntity.getPropertyAccessor(result).setProperty(idProperty, id);
+				Method setter = idProperty.getSetter();
+				if (setter != null) {
+					try {
+						setter.invoke(result, id);
+					} catch (Throwable t) {
+						t.printStackTrace();
+					}
+				}
 			}
-
 		}
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2014 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,26 +15,21 @@
  */
 package org.springframework.data.elasticsearch.core;
 
-import org.elasticsearch.action.update.UpdateResponse;
-import org.elasticsearch.client.Client;
-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.Set;
+
+import org.elasticsearch.action.update.UpdateResponse;
+import org.springframework.data.domain.Page;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+import org.springframework.data.elasticsearch.core.query.*;
 
 /**
  * ElasticsearchOperations
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Kevin Leturc
  */
 public interface ElasticsearchOperations {
 
@@ -43,11 +38,6 @@ public interface ElasticsearchOperations {
 	 */
 	ElasticsearchConverter getElasticsearchConverter();
 
-	/**
-	 * @return elasticsearch client
-	 */
-	Client getClient();
-
 	/**
 	 * Create an index for a class
 	 *
@@ -180,7 +170,7 @@ public interface ElasticsearchOperations {
 	 * @param clazz
 	 * @return
 	 */
-	<T> Page<T> queryForPage(SearchQuery query, Class<T> clazz);
+	<T> FacetedPage<T> queryForPage(SearchQuery query, Class<T> clazz);
 
 	/**
 	 * Execute the query against elasticsearch and return result as {@link Page} using custom mapper
@@ -189,7 +179,7 @@ public interface ElasticsearchOperations {
 	 * @param clazz
 	 * @return
 	 */
-	<T> Page<T> queryForPage(SearchQuery query, Class<T> clazz, SearchResultMapper mapper);
+	<T> FacetedPage<T> queryForPage(SearchQuery query, Class<T> clazz, SearchResultMapper mapper);
 
 	/**
 	 * Execute the query against elasticsearch and return result as {@link Page}
@@ -207,7 +197,7 @@ public interface ElasticsearchOperations {
 	 * @param clazz
 	 * @return
 	 */
-	<T> Page<T> queryForPage(StringQuery query, Class<T> clazz);
+	<T> FacetedPage<T> queryForPage(StringQuery query, Class<T> clazz);
 
 	/**
 	 * Execute the query against elasticsearch and return result as {@link Page} using custom mapper
@@ -216,47 +206,7 @@ public interface ElasticsearchOperations {
 	 * @param clazz
 	 * @return
 	 */
-	<T> Page<T> queryForPage(StringQuery query, Class<T> clazz, SearchResultMapper mapper);
-
-	/**
-	 * 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.
-	 *
-	 * @param <T> element return type
-	 * @param query
-	 * @param clazz
-	 * @return
-	 * @since 1.3
-	 */
-	<T> CloseableIterator<T> stream(CriteriaQuery query, Class<T> clazz);
-
-	/**
-	 * 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.
-	 *
-	 * @param <T> element return type
-	 * @param query
-	 * @param clazz
-	 * @return
-	 * @since 1.3
-	 */
-	<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.
-	 * <p>
-	 * 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
-	 * @param clazz
-	 * @param mapper
-	 * @return
-	 * @since 1.3
-	 */
-	<T> CloseableIterator<T> stream(SearchQuery query, Class<T> clazz, SearchResultMapper mapper);
+	<T> FacetedPage<T> queryForPage(StringQuery query, Class<T> clazz, SearchResultMapper mapper);
 
 	/**
 	 * Execute the criteria query against elasticsearch and return result as {@link List}
@@ -296,23 +246,6 @@ public interface ElasticsearchOperations {
 	 */
 	<T> List<String> queryForIds(SearchQuery query);
 
-	/**
-	 * return number of elements found by given query
-	 *
-	 * @param query
-	 * @param clazz
-	 * @return
-	 */
-	<T> long count(CriteriaQuery query, Class<T> clazz);
-
-	/**
-	 * return number of elements found by given query
-	 *
-	 * @param query
-	 * @return
-	 */
-	<T> long count(CriteriaQuery query);
-
 	/**
 	 * return number of elements found by given query
 	 *
@@ -372,13 +305,6 @@ public interface ElasticsearchOperations {
 	 */
 	void bulkIndex(List<IndexQuery> queries);
 
-	/**
-	 * Bulk update all objects. Will do update
-	 *
-	 * @param queries
-	 */
-	void bulkUpdate(List<UpdateQuery> queries);
-
 	/**
 	 * Delete the one object with provided id
 	 *
@@ -389,14 +315,6 @@ public interface ElasticsearchOperations {
 	 */
 	String delete(String indexName, String type, String id);
 
-
-	/**
-	 * Delete all records matching the criteria
-	 *
-	 * @param clazz
-	 * @param criteriaQuery
-	 */
-	<T> void delete(CriteriaQuery criteriaQuery, Class<T> clazz);
 	/**
 	 * Delete the one object with provided id
 	 *
@@ -438,6 +356,14 @@ public interface ElasticsearchOperations {
 	 */
 	boolean deleteIndex(String indexName);
 
+	/**
+	 * Deletes a type in an index
+	 *
+	 * @param index
+	 * @param type
+	 */
+	void deleteType(String index, String type);
+
 	/**
 	 * check if index is exists
 	 *
@@ -468,72 +394,49 @@ public interface ElasticsearchOperations {
 	 * refresh the index
 	 *
 	 * @param indexName
-	 *
+	 * @param waitForOperation
 	 */
-	void refresh(String indexName);
+	void refresh(String indexName, boolean waitForOperation);
 
 	/**
 	 * refresh the index
 	 *
 	 * @param clazz
-	 *
+	 * @param waitForOperation
 	 */
-	<T> void refresh(Class<T> clazz);
+	<T> void refresh(Class<T> clazz, boolean waitForOperation);
 
 	/**
-	 * Returns scrolled page for given query
+	 * Returns scroll id for scan query
 	 *
-	 * @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)}.
-	 * @param clazz The class of entity to retrieve.
-	 * @return The scan id for input query.
+	 * @param query
+	 * @param scrollTimeInMillis
+	 * @param noFields
+	 * @return
 	 */
-	<T> Page<T> startScroll(long scrollTimeInMillis, SearchQuery query, Class<T> clazz);
+	String scan(SearchQuery query, long scrollTimeInMillis, boolean noFields);
 
 	/**
-	 * Returns scrolled page for given query
-	 *
-	 * @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)}.
-	 * @param mapper Custom impl to map result to entities
-	 * @return The scan id for input query.
-	 */
-	<T> Page<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)}.
-	 * @param clazz The class of entity to retrieve.
-	 * @return The scan id for input query.
-	 */
-	<T> Page<T> startScroll(long scrollTimeInMillis, CriteriaQuery criteriaQuery, Class<T> clazz);
-
-	/**
-	 * 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)}.
-	 * @param mapper Custom impl to map result to entities
-	 * @return The scan id for input query.
-	 */
-	<T> Page<T> startScroll(long scrollTimeInMillis, CriteriaQuery criteriaQuery, Class<T> clazz, SearchResultMapper mapper);
-
-
-	<T> Page<T> continueScroll(@Nullable String scrollId, long scrollTimeInMillis, Class<T> clazz);
-	<T> Page<T> continueScroll(@Nullable String scrollId, long scrollTimeInMillis, Class<T> clazz, SearchResultMapper mapper);
-	/**
-	 * Clears the search contexts associated with specified scroll ids.
+	 * Scrolls the results for give scroll id
 	 *
 	 * @param scrollId
-	 *
+	 * @param scrollTimeInMillis
+	 * @param clazz
+	 * @param <T>
+	 * @return
 	 */
-	<T> void clearScroll(String scrollId);
+	<T> Page<T> scroll(String scrollId, long scrollTimeInMillis, Class<T> clazz);
+
+	/**
+	 * Scrolls the results for give scroll id using custom result mapper
+	 *
+	 * @param scrollId
+	 * @param scrollTimeInMillis
+	 * @param mapper
+	 * @param <T>
+	 * @return
+	 */
+	<T> Page<T> scroll(String scrollId, long scrollTimeInMillis, SearchResultMapper mapper);
 
 	/**
 	 * more like this query to search for documents that are "like" a specific document.
@@ -567,11 +470,5 @@ public interface ElasticsearchOperations {
 	 * @param indexName
 	 * @return
 	 */
-	List<AliasMetaData> queryForAlias(String indexName);
-
-
-	<T> T query(SearchQuery query, ResultsExtractor<T> resultsExtractor);
-
-
-	ElasticsearchPersistentEntity getPersistentEntityFor(Class clazz);
+	Set<String> queryForAlias(String indexName);
 }

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

@@ -26,7 +26,6 @@ import org.springframework.data.elasticsearch.core.facet.FacetResult;
  * @author Artur Konczak
  * @author Jonathan Yan
  */
-@Deprecated
 public interface FacetedPage<T> extends Page<T> {
 
 	boolean hasFacets();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014 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,30 +15,14 @@
  */
 package org.springframework.data.elasticsearch.core;
 
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.elasticsearch.search.aggregations.Aggregation;
-import org.elasticsearch.search.aggregations.Aggregations;
-import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
-import org.elasticsearch.search.aggregations.bucket.range.Range;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms;
-import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStats;
-import org.elasticsearch.search.aggregations.metrics.sum.Sum;
-import org.joda.time.DateTime;
+
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
-import org.springframework.data.elasticsearch.core.facet.AbstractFacetRequest;
 import org.springframework.data.elasticsearch.core.facet.FacetResult;
-import org.springframework.data.elasticsearch.core.facet.request.RangeFacetRequest;
-import org.springframework.data.elasticsearch.core.facet.result.HistogramResult;
-import org.springframework.data.elasticsearch.core.facet.result.IntervalUnit;
-import org.springframework.data.elasticsearch.core.facet.result.RangeResult;
-import org.springframework.data.elasticsearch.core.facet.result.StatisticalResult;
-import org.springframework.data.elasticsearch.core.facet.result.Term;
-import org.springframework.data.elasticsearch.core.facet.result.TermResult;
 
 /**
  * Container for query result and facet results
@@ -47,119 +31,40 @@ import org.springframework.data.elasticsearch.core.facet.result.TermResult;
  * @author Mohsin Husen
  * @author Artur Konczak
  * @author Jonathan Yan
- * @author Philipp Kräutli
  */
-@Deprecated
-public abstract class FacetedPageImpl<T> extends PageImpl<T> implements FacetedPage<T>, AggregatedPage<T> {
+public class FacetedPageImpl<T> extends PageImpl<T> implements FacetedPage<T> {
 
 	private List<FacetResult> facets;
-	private Map<String, FacetResult> mapOfFacets = new HashMap<>();
+	private Map<String, FacetResult> mapOfFacets = new HashMap<String, FacetResult>();
 
 	public FacetedPageImpl(List<T> content) {
 		super(content);
 	}
 
 	public FacetedPageImpl(List<T> content, Pageable pageable, long total) {
-		super(content, Pageable.unpaged(), total);
+		super(content, pageable, total);
+	}
+
+	public FacetedPageImpl(List<T> content, Pageable pageable, long total, List<FacetResult> facets) {
+		super(content, pageable, total);
+		this.facets = facets;
+		for (FacetResult facet : facets) {
+			mapOfFacets.put(facet.getName(), facet);
+		}
 	}
 
 	@Override
 	public boolean hasFacets() {
-		processAggregations();
-		return facets != null && facets.size() > 0;
+		return CollectionUtils.isNotEmpty(facets);
 	}
 
 	@Override
 	public List<FacetResult> getFacets() {
-		processAggregations();
 		return facets;
 	}
 
 	@Override
 	public FacetResult getFacet(String name) {
-		processAggregations();
 		return mapOfFacets.get(name);
 	}
-
-	private void addFacet(FacetResult facetResult) {
-		facets.add(facetResult);
-		mapOfFacets.put(facetResult.getName(), facetResult);
-	}
-
-	/**
-	 * Lazy conversion from aggregation to old facets
-	 */
-	private void processAggregations() {
-		if (facets != null) {
-			return;
-		}
-		facets = new ArrayList<>();
-		Aggregations aggregations = getAggregations();
-		if (aggregations == null) {
-			return;
-		}
-		for (Aggregation agg : aggregations) {
-			processAggregation(agg);
-		}
-	}
-
-	private void processAggregation(Aggregation agg)
-	{
-		if (agg instanceof Terms) {
-			processTermAggregation((Terms) agg);
-		}
-		if (agg instanceof Range) {
-			processRangeAggregation((Range) agg);
-		}
-		if (agg instanceof ExtendedStats) {
-			processExtendedStatsAggregation((ExtendedStats) agg);
-		}
-		if (agg instanceof Histogram) {
-			processHistogramAggregation((Histogram) agg);
-		}
-	}
-
-	private void processTermAggregation(Terms agg)
-	{
-		List<Term> terms = new ArrayList<>();
-		for (Terms.Bucket t : agg.getBuckets()) {
-			terms.add(new Term(t.getKeyAsString(), t.getDocCount()));
-		}
-		addFacet(new TermResult(agg.getName(), terms, terms.size(), agg.getSumOfOtherDocCounts(), 0));
-	}
-
-	private void processRangeAggregation(Range agg)
-	{
-		List<? extends Range.Bucket> buckets = ((Range) agg).getBuckets();
-		List<org.springframework.data.elasticsearch.core.facet.result.Range> ranges = new ArrayList<>();
-		for (Range.Bucket b : buckets) {
-			ExtendedStats rStats = b.getAggregations().get(AbstractFacetRequest.INTERNAL_STATS);
-			if (rStats != null) {
-				Sum sum = b.getAggregations().get(RangeFacetRequest.RANGE_INTERNAL_SUM);
-				ranges.add(new org.springframework.data.elasticsearch.core.facet.result.Range((Double) b.getFrom(), (Double) b.getTo(), b.getDocCount(), sum != null ? sum.getValue() : rStats.getSum(), rStats.getCount(), rStats.getMin(), rStats.getMax()));
-			} else {
-				ranges.add(new org.springframework.data.elasticsearch.core.facet.result.Range((Double) b.getFrom(), (Double) b.getTo(), b.getDocCount(), 0, 0, 0, 0));
-			}
-		}
-		addFacet(new RangeResult(agg.getName(), ranges));
-	}
-
-	private void processExtendedStatsAggregation(ExtendedStats agg)
-	{
-		addFacet(new StatisticalResult(agg.getName(), agg.getCount(), agg.getMax(), agg.getMin(), agg.getAvg(), agg.getStdDeviation(), agg.getSumOfSquares(), agg.getSum(), agg.getVariance()));
-	}
-
-	private void processHistogramAggregation(Histogram agg)
-	{
-		List<IntervalUnit> intervals = new ArrayList<>();
-		for (Histogram.Bucket h : agg.getBuckets()) {
-			ExtendedStats hStats = h.getAggregations().get(AbstractFacetRequest.INTERNAL_STATS);
-			if (hStats != null) {
-				intervals.add(new IntervalUnit(((DateTime) h.getKey()).getMillis(), h.getDocCount(), h.getDocCount(), hStats.getSum(), hStats.getAvg(), hStats.getMin(), hStats.getMax()));
-			} else {
-				intervals.add(new IntervalUnit(((DateTime) h.getKey()).getMillis(), h.getDocCount(), h.getDocCount(), 0, 0, 0, 0));
-			}
-		}
-		addFacet(new HistogramResult(agg.getName(), intervals));
-	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014 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,66 +15,46 @@
  */
 package org.springframework.data.elasticsearch.core;
 
+import static org.apache.commons.lang.StringUtils.*;
+import static org.elasticsearch.common.xcontent.XContentFactory.*;
+import static org.springframework.util.StringUtils.*;
+
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Map;
+
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.springframework.core.ResolvableType;
-import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.GenericCollectionTypeResolver;
 import org.springframework.data.annotation.Transient;
-import org.springframework.data.elasticsearch.annotations.CompletionField;
-import org.springframework.data.elasticsearch.annotations.DateFormat;
-import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
-import org.springframework.data.elasticsearch.annotations.GeoPointField;
-import org.springframework.data.elasticsearch.annotations.InnerField;
-import org.springframework.data.elasticsearch.annotations.Mapping;
-import org.springframework.data.elasticsearch.annotations.MultiField;
-import org.springframework.data.elasticsearch.core.completion.Completion;
+import org.springframework.data.elasticsearch.annotations.*;
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
-import static org.apache.commons.lang.StringUtils.*;
-import static org.elasticsearch.common.xcontent.XContentFactory.*;
-import static org.springframework.util.StringUtils.*;
 
 /**
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Artur Konczak
- * @author Kevin Leturc
- * @author Alexander Volz
- * @author Dennis Maaß
- * @author Pavel Luhin
- * @author Mark Paluch
  */
+
 class MappingBuilder {
 
-	public static final String FIELD_DATA = "fielddata";
 	public static final String FIELD_STORE = "store";
 	public static final String FIELD_TYPE = "type";
 	public static final String FIELD_INDEX = "index";
 	public static final String FIELD_FORMAT = "format";
 	public static final String FIELD_SEARCH_ANALYZER = "search_analyzer";
-	public static final String FIELD_INDEX_ANALYZER = "analyzer";
+	public static final String FIELD_INDEX_ANALYZER = "index_analyzer";
 	public static final String FIELD_PROPERTIES = "properties";
 	public static final String FIELD_PARENT = "_parent";
 
-	public static final String COMPLETION_PRESERVE_SEPARATORS = "preserve_separators";
-	public static final String COMPLETION_PRESERVE_POSITION_INCREMENTS = "preserve_position_increments";
-	public static final String COMPLETION_MAX_INPUT_LENGTH = "max_input_length";
-
 	public static final String INDEX_VALUE_NOT_ANALYZED = "not_analyzed";
-	public static final String TYPE_VALUE_STRING = "text";
+	public static final String TYPE_VALUE_STRING = "string";
 	public static final String TYPE_VALUE_GEO_POINT = "geo_point";
-	public static final String TYPE_VALUE_COMPLETION = "completion";
-	public static final String TYPE_VALUE_GEO_HASH_PREFIX = "geohash_prefix";
-	public static final String TYPE_VALUE_GEO_HASH_PRECISION = "geohash_precision";
 
-	private static SimpleTypeHolder SIMPLE_TYPE_HOLDER = SimpleTypeHolder.DEFAULT;
+	private static SimpleTypeHolder SIMPLE_TYPE_HOLDER = new SimpleTypeHolder();
 
 	static XContentBuilder buildMapping(Class clazz, String indexType, String idFieldName, String parentType) throws IOException {
 
@@ -87,56 +67,39 @@ class MappingBuilder {
 		// Properties
 		XContentBuilder xContentBuilder = mapping.startObject(FIELD_PROPERTIES);
 
-		mapEntity(xContentBuilder, clazz, true, idFieldName, EMPTY, false, FieldType.Auto, null);
+		mapEntity(xContentBuilder, clazz, true, idFieldName, EMPTY, false, FieldType.Auto);
 
 		return xContentBuilder.endObject().endObject().endObject();
 	}
 
 	private static void mapEntity(XContentBuilder xContentBuilder, Class clazz, boolean isRootObject, String idFieldName,
-								  String nestedObjectFieldName, boolean nestedOrObjectField, FieldType fieldType, Field fieldAnnotation) throws IOException {
+								  String nestedObjectFieldName, boolean nestedOrObjectField, FieldType fieldType) throws IOException {
 
-		java.lang.reflect.Field[] fields = retrieveFields(clazz);
+		java.lang.reflect.Field[] fields = clazz.getDeclaredFields();
 
 		if (!isRootObject && (isAnyPropertyAnnotatedAsField(fields) || nestedOrObjectField)) {
 			String type = FieldType.Object.toString().toLowerCase();
 			if (nestedOrObjectField) {
 				type = fieldType.toString().toLowerCase();
 			}
-			XContentBuilder t = xContentBuilder.startObject(nestedObjectFieldName).field(FIELD_TYPE, type);
-
-			if (nestedOrObjectField && FieldType.Nested == fieldType && fieldAnnotation.includeInParent()) {
-				t.field("include_in_parent", fieldAnnotation.includeInParent());
-			}
-			t.startObject(FIELD_PROPERTIES);
+			xContentBuilder.startObject(nestedObjectFieldName).field(FIELD_TYPE, type).startObject(FIELD_PROPERTIES);
 		}
 
 		for (java.lang.reflect.Field field : fields) {
 
-			if (field.isAnnotationPresent(Transient.class) || isInIgnoreFields(field, fieldAnnotation)) {
+			if (field.isAnnotationPresent(Transient.class) || isInIgnoreFields(field)) {
 				continue;
 			}
 
-			if (field.isAnnotationPresent(Mapping.class)) {
-				String mappingPath = field.getAnnotation(Mapping.class).mappingPath();
-				if (isNotBlank(mappingPath)) {
-					ClassPathResource mappings = new ClassPathResource(mappingPath);
-					if (mappings.exists()) {
-						xContentBuilder.rawField(field.getName(), mappings.getInputStream());
-						continue;
-					}
-				}
-			}
-
-			boolean isGeoPointField = isGeoPointField(field);
-			boolean isCompletionField = isCompletionField(field);
+			boolean isGeoField = isGeoField(field);
 
 			Field singleField = field.getAnnotation(Field.class);
-			if (!isGeoPointField && !isCompletionField && isEntity(field) && isAnnotated(field)) {
+			if (!isGeoField && isEntity(field) && !isAnnotated(field)) {
 				if (singleField == null) {
 					continue;
 				}
 				boolean nestedOrObject = isNestedOrObjectField(field);
-				mapEntity(xContentBuilder, getFieldType(field), false, EMPTY, field.getName(), nestedOrObject, singleField.type(), field.getAnnotation(Field.class));
+				mapEntity(xContentBuilder, getFieldType(field), false, EMPTY, field.getName(), nestedOrObject, field.getAnnotation(Field.class).type());
 				if (nestedOrObject) {
 					continue;
 				}
@@ -144,21 +107,16 @@ class MappingBuilder {
 
 			MultiField multiField = field.getAnnotation(MultiField.class);
 
-			if (isGeoPointField) {
+			if (isGeoField) {
 				applyGeoPointFieldMapping(xContentBuilder, field);
 			}
 
-			if (isCompletionField) {
-				CompletionField completionField = field.getAnnotation(CompletionField.class);
-				applyCompletionFieldMapping(xContentBuilder, field, completionField);
-			}
-
 			if (isRootObject && singleField != null && isIdField(field, idFieldName)) {
 				applyDefaultIdFieldMapping(xContentBuilder, field);
 			} else if (multiField != null) {
-				addMultiFieldMapping(xContentBuilder, field, multiField, isNestedOrObjectField(field));
+				addMultiFieldMapping(xContentBuilder, field, multiField);
 			} else if (singleField != null) {
-				addSingleFieldMapping(xContentBuilder, field, singleField, isNestedOrObjectField(field));
+				addSingleFieldMapping(xContentBuilder, field, singleField);
 			}
 		}
 
@@ -167,49 +125,14 @@ class MappingBuilder {
 		}
 	}
 
-	private static java.lang.reflect.Field[] retrieveFields(Class clazz) {
-		// Create list of fields.
-		List<java.lang.reflect.Field> fields = new ArrayList<>();
-
-		// Keep backing up the inheritance hierarchy.
-		Class targetClass = clazz;
-		do {
-			fields.addAll(Arrays.asList(targetClass.getDeclaredFields()));
-			targetClass = targetClass.getSuperclass();
-		}
-		while (targetClass != null && targetClass != Object.class);
-
-		return fields.toArray(new java.lang.reflect.Field[fields.size()]);
-	}
-
 	private static boolean isAnnotated(java.lang.reflect.Field field) {
-		return field.getAnnotation(Field.class) != null ||
-				field.getAnnotation(MultiField.class) != null ||
-				field.getAnnotation(GeoPointField.class) != null ||
-				field.getAnnotation(CompletionField.class) != null;
+		return field.getAnnotation(Field.class) == null && field.getAnnotation(MultiField.class) == null && field.getAnnotation(GeoPointField.class) == null;
 	}
 
 	private static void applyGeoPointFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field) throws IOException {
 		xContentBuilder.startObject(field.getName());
-		xContentBuilder.field(FIELD_TYPE, TYPE_VALUE_GEO_POINT);
-		xContentBuilder.endObject();
-	}
-
-	private static void applyCompletionFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field, CompletionField annotation) throws IOException {
-		xContentBuilder.startObject(field.getName());
-		xContentBuilder.field(FIELD_TYPE, TYPE_VALUE_COMPLETION);
-		if (annotation != null) {
-			xContentBuilder.field(COMPLETION_MAX_INPUT_LENGTH, annotation.maxInputLength());
-			xContentBuilder.field(COMPLETION_PRESERVE_POSITION_INCREMENTS, annotation.preservePositionIncrements());
-			xContentBuilder.field(COMPLETION_PRESERVE_SEPARATORS, annotation.preserveSeparators());
-			if (isNotBlank(annotation.searchAnalyzer())) {
-				xContentBuilder.field(FIELD_SEARCH_ANALYZER, annotation.searchAnalyzer());
-			}
-			if (isNotBlank(annotation.analyzer())) {
-				xContentBuilder.field(FIELD_INDEX_ANALYZER, annotation.analyzer());
-			}
-		}
-		xContentBuilder.endObject();
+		xContentBuilder.field(FIELD_TYPE, TYPE_VALUE_GEO_POINT)
+				.endObject();
 	}
 
 	private static void applyDefaultIdFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field)
@@ -223,18 +146,15 @@ class MappingBuilder {
 	/**
 	 * Apply mapping for a single @Field annotation
 	 *
+	 * @param xContentBuilder
+	 * @param field
+	 * @param fieldAnnotation
 	 * @throws IOException
 	 */
 	private static void addSingleFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field,
-											  Field fieldAnnotation, boolean nestedOrObjectField) throws IOException {
+											  Field fieldAnnotation) throws IOException {
 		xContentBuilder.startObject(field.getName());
-		if(!nestedOrObjectField) {
-			xContentBuilder.field(FIELD_STORE, fieldAnnotation.store());
-		}
-		if(fieldAnnotation.fielddata()) {
-			xContentBuilder.field(FIELD_DATA, fieldAnnotation.fielddata());
-		}
-
+		xContentBuilder.field(FIELD_STORE, fieldAnnotation.store());
 		if (FieldType.Auto != fieldAnnotation.type()) {
 			xContentBuilder.field(FIELD_TYPE, fieldAnnotation.type().name().toLowerCase());
 			if (FieldType.Date == fieldAnnotation.type() && DateFormat.none != fieldAnnotation.format()) {
@@ -242,14 +162,14 @@ class MappingBuilder {
 						? fieldAnnotation.pattern() : fieldAnnotation.format());
 			}
 		}
-		if(!fieldAnnotation.index()) {
-			xContentBuilder.field(FIELD_INDEX, fieldAnnotation.index());
+		if (FieldIndex.not_analyzed == fieldAnnotation.index()) {
+			xContentBuilder.field(FIELD_INDEX, fieldAnnotation.index().name().toLowerCase());
 		}
 		if (isNotBlank(fieldAnnotation.searchAnalyzer())) {
 			xContentBuilder.field(FIELD_SEARCH_ANALYZER, fieldAnnotation.searchAnalyzer());
 		}
-		if (isNotBlank(fieldAnnotation.analyzer())) {
-			xContentBuilder.field(FIELD_INDEX_ANALYZER, fieldAnnotation.analyzer());
+		if (isNotBlank(fieldAnnotation.indexAnalyzer())) {
+			xContentBuilder.field(FIELD_INDEX_ANALYZER, fieldAnnotation.indexAnalyzer());
 		}
 		xContentBuilder.endObject();
 	}
@@ -257,17 +177,20 @@ class MappingBuilder {
 	/**
 	 * Apply mapping for a single nested @Field annotation
 	 *
+	 * @param builder
+	 * @param field
+	 * @param annotation
 	 * @throws IOException
 	 */
 	private static void addNestedFieldMapping(XContentBuilder builder, java.lang.reflect.Field field,
-											  InnerField annotation) throws IOException {
-		builder.startObject(annotation.suffix());
-		//builder.field(FIELD_STORE, annotation.store());
+											  NestedField annotation) throws IOException {
+		builder.startObject(field.getName() + "." + annotation.dotSuffix());
+		builder.field(FIELD_STORE, annotation.store());
 		if (FieldType.Auto != annotation.type()) {
 			builder.field(FIELD_TYPE, annotation.type().name().toLowerCase());
 		}
-		if(!annotation.index()) {
-			builder.field(FIELD_INDEX, annotation.index());
+		if (FieldIndex.not_analyzed == annotation.index()) {
+			builder.field(FIELD_INDEX, annotation.index().name().toLowerCase());
 		}
 		if (isNotBlank(annotation.searchAnalyzer())) {
 			builder.field(FIELD_SEARCH_ANALYZER, annotation.searchAnalyzer());
@@ -275,31 +198,64 @@ class MappingBuilder {
 		if (isNotBlank(annotation.indexAnalyzer())) {
 			builder.field(FIELD_INDEX_ANALYZER, annotation.indexAnalyzer());
 		}
-		if (annotation.fielddata()) {
-			builder.field(FIELD_DATA, annotation.fielddata());
-		}
 		builder.endObject();
 	}
 
 	/**
 	 * Multi field mappings for string type fields, support for sorts and facets
 	 *
+	 * @param builder
+	 * @param field
+	 * @param annotation
 	 * @throws IOException
 	 */
 	private static void addMultiFieldMapping(XContentBuilder builder, java.lang.reflect.Field field,
-											 MultiField annotation, boolean nestedOrObjectField) throws IOException {
+											 MultiField annotation) throws IOException {
 		builder.startObject(field.getName());
-		builder.field(FIELD_TYPE, annotation.mainField().type());
+		builder.field(FIELD_TYPE, "multi_field");
 		builder.startObject("fields");
 		//add standard field
-		//addSingleFieldMapping(builder, field, annotation.mainField(), nestedOrObjectField);
-		for (InnerField innerField : annotation.otherFields()) {
-			addNestedFieldMapping(builder, field, innerField);
+		addSingleFieldMapping(builder, field, annotation.mainField());
+		for (NestedField nestedField : annotation.otherFields()) {
+			addNestedFieldMapping(builder, field, nestedField);
 		}
 		builder.endObject();
 		builder.endObject();
 	}
 
+	/**
+	 * Facet field for string type, for other types we don't need it(long, int, double, float)
+	 *
+	 * @param builder
+	 * @param field
+	 * @param annotation
+	 * @throws IOException
+	 */
+	private static void addFacetMapping(XContentBuilder builder, java.lang.reflect.Field field, Field annotation) throws IOException {
+		builder.startObject(FacetRequest.FIELD_UNTOUCHED)
+				.field(FIELD_TYPE, TYPE_VALUE_STRING)
+				.field(FIELD_INDEX, INDEX_VALUE_NOT_ANALYZED)
+				.field(FIELD_STORE, true);
+		builder.endObject();
+	}
+
+	/**
+	 * Sort field for string type, for other types we don't need it(long, int, double, float)
+	 * value of the field should be converted to lowercase and not analise
+	 *
+	 * @param builder
+	 * @param field
+	 * @param annotation
+	 * @throws IOException
+	 */
+	private static void addSortMapping(XContentBuilder builder, java.lang.reflect.Field field, Field annotation) throws IOException {
+		builder.startObject(FacetRequest.FIELD_SORT)
+				.field(FIELD_TYPE, TYPE_VALUE_STRING)
+				.field(FIELD_INDEX, "keyword")
+				.field(FIELD_STORE, true);
+		builder.endObject();
+	}
+
 	protected static boolean isEntity(java.lang.reflect.Field field) {
 		TypeInformation typeInformation = ClassTypeInformation.from(field.getType());
 		Class<?> clazz = getFieldType(field);
@@ -308,20 +264,12 @@ class MappingBuilder {
 	}
 
 	protected static Class<?> getFieldType(java.lang.reflect.Field field) {
-
-		ResolvableType resolvableType = ResolvableType.forField(field);
-
-		if (resolvableType.isArray()) {
-			return resolvableType.getComponentType().getRawClass();
+		Class<?> clazz = field.getType();
+		TypeInformation typeInformation = ClassTypeInformation.from(clazz);
+		if (typeInformation.isCollectionLike()) {
+			clazz = GenericCollectionTypeResolver.getCollectionFieldType(field) != null ? GenericCollectionTypeResolver.getCollectionFieldType(field) : typeInformation.getComponentType().getType();
 		}
-
-		ResolvableType componentType = resolvableType.getGeneric(0);
-		if (Iterable.class.isAssignableFrom(field.getType())
-				&& componentType != ResolvableType.NONE) {
-			return componentType.getRawClass();
-		}
-
-		return resolvableType.getRawClass();
+		return clazz;
 	}
 
 	private static boolean isAnyPropertyAnnotatedAsField(java.lang.reflect.Field[] fields) {
@@ -339,9 +287,10 @@ class MappingBuilder {
 		return idFieldName.equals(field.getName());
 	}
 
-	private static boolean isInIgnoreFields(java.lang.reflect.Field field, Field parentFieldAnnotation) {
-		if (null != parentFieldAnnotation) {
-			String[] ignoreFields = parentFieldAnnotation.ignoreFields();
+	private static boolean isInIgnoreFields(java.lang.reflect.Field field) {
+		Field fieldAnnotation = field.getAnnotation(Field.class);
+		if (null != fieldAnnotation) {
+			String[] ignoreFields = fieldAnnotation.ignoreFields();
 			return Arrays.asList(ignoreFields).contains(field.getName());
 		}
 		return false;
@@ -352,11 +301,7 @@ class MappingBuilder {
 		return fieldAnnotation != null && (FieldType.Nested == fieldAnnotation.type() || FieldType.Object == fieldAnnotation.type());
 	}
 
-	private static boolean isGeoPointField(java.lang.reflect.Field field) {
+	private static boolean isGeoField(java.lang.reflect.Field field) {
 		return field.getType() == GeoPoint.class || field.getAnnotation(GeoPointField.class) != null;
 	}
-
-	private static boolean isCompletionField(java.lang.reflect.Field field) {
-		return field.getType() == Completion.class;
-	}
 }

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

@@ -1,24 +0,0 @@
-/*
- * Copyright 2013-2014 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
- *
- *      http://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 org.elasticsearch.action.search.SearchResponse;
-
-public interface ResultsExtractor<T> {
-
-	T extract(SearchResponse response);
-}

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

@@ -1,13 +0,0 @@
-
-package org.springframework.data.elasticsearch.core;
-
-import org.springframework.data.domain.Page;
-
-/**
- * @author Artur Konczak
- */
-public interface ScrolledPage<T> extends Page<T> {
-
-    String getScrollId();
-
-}

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

@@ -17,13 +17,11 @@ package org.springframework.data.elasticsearch.core;
 
 import org.elasticsearch.action.search.SearchResponse;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
 
 /**
  * @author Artur Konczak
- * @author Petar Tahchiev
  */
 public interface SearchResultMapper {
 
-	<T> AggregatedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable);
+	<T> FacetedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable);
 }

src/main/java/org/springframework/data/elasticsearch/core/aggregation/AggregatedPage.java

@@ -1,18 +0,0 @@
-package org.springframework.data.elasticsearch.core.aggregation;
-
-import org.elasticsearch.search.aggregations.Aggregation;
-import org.elasticsearch.search.aggregations.Aggregations;
-import org.springframework.data.elasticsearch.core.FacetedPage;
-import org.springframework.data.elasticsearch.core.ScrolledPage;
-
-/**
- * @author Petar Tahchiev
- */
-public interface AggregatedPage<T> extends FacetedPage<T>, ScrolledPage<T> {
-
-	boolean hasAggregations();
-
-	Aggregations getAggregations();
-
-	Aggregation getAggregation(String name);
-}

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

@@ -1,97 +0,0 @@
-/*
- * Copyright 2017 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
- *
- *      http://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.aggregation.impl;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.elasticsearch.search.aggregations.Aggregation;
-import org.elasticsearch.search.aggregations.Aggregations;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.elasticsearch.core.FacetedPageImpl;
-import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
-
-/**
- * @author Petar Tahchiev
- * @author Artur Konczak
- * @author Mohsin Husen
- */
-public class AggregatedPageImpl<T> extends FacetedPageImpl<T> implements AggregatedPage<T> {
-
-	private Aggregations aggregations;
-	private Map<String, Aggregation> mapOfAggregations = new HashMap<>();
-    private String scrollId;
-
-	public AggregatedPageImpl(List<T> content) {
-		super(content);
-	}
-
-	public AggregatedPageImpl(List<T> content, String scrollId) {
-		super(content);
-		this.scrollId = scrollId;
-	}
-
-	public AggregatedPageImpl(List<T> content, Pageable pageable, long total) {
-		super(content, pageable, total);
-	}
-
-	public AggregatedPageImpl(List<T> content, Pageable pageable, long total, String scrollId) {
-		super(content, pageable, total);
-		this.scrollId = scrollId;
-	}
-
-	public AggregatedPageImpl(List<T> content, Pageable pageable, long total, Aggregations aggregations) {
-		super(content, pageable, total);
-		this.aggregations = aggregations;
-		if (aggregations != null) {
-			for (Aggregation aggregation : aggregations) {
-				mapOfAggregations.put(aggregation.getName(), aggregation);
-			}
-		}
-	}
-
-	public AggregatedPageImpl(List<T> content, Pageable pageable, long total, Aggregations aggregations, String scrollId) {
-		super(content, pageable, total);
-		this.aggregations = aggregations;
-		this.scrollId = scrollId;
-		if (aggregations != null) {
-			for (Aggregation aggregation : aggregations) {
-				mapOfAggregations.put(aggregation.getName(), aggregation);
-			}
-		}
-	}
-
-	@Override
-	public boolean hasAggregations() {
-		return aggregations != null && mapOfAggregations.size() > 0;
-	}
-
-	@Override
-	public Aggregations getAggregations() {
-		return aggregations;
-	}
-
-	@Override
-	public Aggregation getAggregation(String name) {
-		return aggregations == null ? null : aggregations.get(name);
-	}
-
-	@Override
-	public String getScrollId() {
-		return scrollId;
-	}
-}

src/main/java/org/springframework/data/elasticsearch/core/completion/Completion.java

@@ -1,39 +0,0 @@
-package org.springframework.data.elasticsearch.core.completion;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-
-/**
- * Based on the reference doc - http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-suggesters-completion.html
- *
- * @author Mewes Kochheim
- */
-@JsonInclude(value = JsonInclude.Include.NON_NULL)
-public class Completion {
-
-	private String[] input;
-	private Integer weight;
-
-	private Completion() {
-		//required by mapper to instantiate object
-	}
-
-	public Completion(String[] input) {
-		this.input = input;
-	}
-
-	public String[] getInput() {
-		return input;
-	}
-
-	public void setInput(String[] input) {
-		this.input = input;
-	}
-
-	public Integer getWeight() {
-		return weight;
-	}
-
-	public void setWeight(Integer weight) {
-		this.weight = weight;
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013 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.
@@ -31,8 +31,8 @@ import org.springframework.util.Assert;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Mark Paluch
  */
+
 public class MappingElasticsearchConverter implements ElasticsearchConverter, ApplicationContextAware {
 
 	private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext;
@@ -43,9 +43,7 @@ public class MappingElasticsearchConverter implements ElasticsearchConverter, Ap
 
 	public MappingElasticsearchConverter(
 			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
-		
-		Assert.notNull(mappingContext, "MappingContext must not be null!");
-		
+		Assert.notNull(mappingContext);
 		this.mappingContext = mappingContext;
 		this.conversionService = new DefaultConversionService();
 	}
@@ -63,8 +61,5 @@ public class MappingElasticsearchConverter implements ElasticsearchConverter, Ap
 	@Override
 	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
 		this.applicationContext = applicationContext;
-		if (mappingContext instanceof ApplicationContextAware) {
-			((ApplicationContextAware) mappingContext).setApplicationContext(applicationContext);
-		}
 	}
 }

src/main/java/org/springframework/data/elasticsearch/core/facet/AbstractFacetRequest.java

@@ -13,20 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.elasticsearch.core.facet;
 
 import org.springframework.util.Assert;
 
-
 /**
  * @author Artur Konczak
  */
-@Deprecated
 public abstract class AbstractFacetRequest implements FacetRequest {
 
-	public static final String INTERNAL_STATS = "internal-stats";
-
 	private String name;
 	private boolean applyQueryFilter;
 
@@ -47,4 +42,4 @@ public abstract class AbstractFacetRequest implements FacetRequest {
 	public boolean applyQueryFilter() {
 		return applyQueryFilter;
 	}
-}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/AbstractFacetResult.java

@@ -23,7 +23,6 @@ import org.springframework.util.Assert;
  * @author Artur Konczak
  * @author Jonathan Yan
  */
-@Deprecated
 public class AbstractFacetResult implements FacetResult {
 
 	private final String name;

src/main/java/org/springframework/data/elasticsearch/core/facet/DefaultFacetMapper.java

@@ -0,0 +1,81 @@
+/*
+ * Copyright 2014 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
+ *
+ *      http://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.facet;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.elasticsearch.search.facet.Facet;
+import org.elasticsearch.search.facet.histogram.HistogramFacet;
+import org.elasticsearch.search.facet.range.RangeFacet;
+import org.elasticsearch.search.facet.statistical.StatisticalFacet;
+import org.elasticsearch.search.facet.terms.TermsFacet;
+import org.springframework.data.elasticsearch.core.facet.result.*;
+
+/**
+ * @author Artur Konczak
+ * @author Petar Tahchiev
+ */
+public class DefaultFacetMapper {
+
+	public static FacetResult parse(Facet facet) {
+		if (facet instanceof TermsFacet) {
+			return parseTerm((TermsFacet) facet);
+		}
+
+		if (facet instanceof RangeFacet) {
+			return parseRange((RangeFacet) facet);
+		}
+
+		if (facet instanceof StatisticalFacet) {
+			return parseStatistical((StatisticalFacet) facet);
+		}
+
+		if (facet instanceof HistogramFacet) {
+			return parseHistogram((HistogramFacet) facet);
+		}
+
+		return null;
+	}
+
+	private static FacetResult parseTerm(TermsFacet facet) {
+		List<Term> entries = new ArrayList<Term>();
+		for (TermsFacet.Entry entry : facet.getEntries()) {
+			entries.add(new Term(entry.getTerm().toString(), entry.getCount()));
+		}
+		return new TermResult(facet.getName(), entries);
+	}
+
+	private static FacetResult parseRange(RangeFacet facet) {
+		List<Range> entries = new ArrayList<Range>();
+		for (RangeFacet.Entry entry : facet.getEntries()) {
+			entries.add(new Range(entry.getFrom() == Double.NEGATIVE_INFINITY ? null : entry.getFrom(), entry.getTo() == Double.POSITIVE_INFINITY ? null : entry.getTo(), entry.getCount(), entry.getTotal(), entry.getTotalCount(), entry.getMin(), entry.getMax()));
+		}
+		return new RangeResult(facet.getName(), entries);
+	}
+
+	private static FacetResult parseStatistical(StatisticalFacet facet) {
+		return new StatisticalResult(facet.getName(), facet.getCount(), facet.getMax(), facet.getMin(), facet.getMean(), facet.getStdDeviation(), facet.getSumOfSquares(), facet.getTotal(), facet.getVariance());
+	}
+
+	private static FacetResult parseHistogram(HistogramFacet facet) {
+		List<IntervalUnit> entries = new ArrayList<IntervalUnit>();
+		for (HistogramFacet.Entry entry : facet.getEntries()) {
+			entries.add(new IntervalUnit(entry.getKey(), entry.getCount(), entry.getTotalCount(), entry.getTotal(), entry.getMean(), entry.getMin(), entry.getMax()));
+		}
+		return new HistogramResult(facet.getName(), entries);
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/FacetRequest.java

@@ -13,21 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.elasticsearch.core.facet;
 
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
+import org.elasticsearch.search.facet.FacetBuilder;
 
 /**
  * @author Artur Koczak
  */
-@Deprecated
 public interface FacetRequest {
 
 	public static final String FIELD_UNTOUCHED = "untouched";
 	public static final String FIELD_SORT = "sort";
 
-	AbstractAggregationBuilder getFacet();
+	FacetBuilder getFacet();
 
 	boolean applyQueryFilter();
 }

src/main/java/org/springframework/data/elasticsearch/core/facet/FacetResult.java

@@ -23,7 +23,6 @@ package org.springframework.data.elasticsearch.core.facet;
  * @author Artur Konczak
  * @author Jonathan Yan
  */
-@Deprecated
 public interface FacetResult {
 
 	String getName();

src/main/java/org/springframework/data/elasticsearch/core/facet/FacetType.java

@@ -19,7 +19,6 @@ package org.springframework.data.elasticsearch.core.facet;
  * @author Artur Konczak
  * @author Petar Tahchiev
  */
-@Deprecated
 public enum FacetType {
 
 	term, range, histogram, statistical

src/main/java/org/springframework/data/elasticsearch/core/facet/request/HistogramFacetRequest.java

@@ -13,28 +13,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.elasticsearch.core.facet.request;
 
+import java.util.concurrent.TimeUnit;
+
 import org.apache.commons.lang.StringUtils;
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
+import org.elasticsearch.search.facet.FacetBuilder;
+import org.elasticsearch.search.facet.FacetBuilders;
+import org.elasticsearch.search.facet.histogram.HistogramFacetBuilder;
 import org.springframework.data.elasticsearch.core.facet.AbstractFacetRequest;
 import org.springframework.util.Assert;
 
-
 /**
  * @author Artur Konczak
  * @author Mohsin Husen
  */
-@Deprecated
 public class HistogramFacetRequest extends AbstractFacetRequest {
 
 	private String field;
 	private long interval;
-	private DateHistogramInterval timeUnit;
+	private TimeUnit timeUnit;
 
 	public HistogramFacetRequest(String name) {
 		super(name);
@@ -48,26 +46,24 @@ public class HistogramFacetRequest extends AbstractFacetRequest {
 		this.interval = interval;
 	}
 
-	public void setTimeUnit(DateHistogramInterval timeUnit) {
+	public void setTimeUnit(TimeUnit timeUnit) {
 		this.timeUnit = timeUnit;
 	}
 
-	public AbstractAggregationBuilder getFacet() {
+	public FacetBuilder getFacet() {
 		Assert.notNull(getName(), "Facet name can't be a null !!!");
 		Assert.isTrue(StringUtils.isNotBlank(field), "Please select field on which to build the facet !!!");
 		Assert.isTrue(interval > 0, "Please provide interval as positive value greater them zero !!!");
 
-		DateHistogramAggregationBuilder dateHistogramBuilder = AggregationBuilders.dateHistogram(getName());
-		dateHistogramBuilder.field(field);
+		HistogramFacetBuilder builder = FacetBuilders.histogramFacet(getName());
+		builder.field(field);
 
 		if (timeUnit != null) {
-			dateHistogramBuilder.dateHistogramInterval(timeUnit);
+			builder.interval(interval, timeUnit);
 		} else {
-			dateHistogramBuilder.interval(interval);
+			builder.interval(interval);
 		}
 
-		dateHistogramBuilder.subAggregation(AggregationBuilders.extendedStats(INTERNAL_STATS).field(field));
-
-		return dateHistogramBuilder;
+		return builder;
 	}
-}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/request/HistogramFacetRequestBuilder.java

@@ -13,17 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.elasticsearch.core.facet.request;
 
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
-import org.springframework.data.elasticsearch.core.facet.FacetRequest;
+import java.util.concurrent.TimeUnit;
 
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
 
 /**
  * @author Artur Konczak
  */
-@Deprecated
 public class HistogramFacetRequestBuilder {
 
 	HistogramFacetRequest result;
@@ -42,7 +40,7 @@ public class HistogramFacetRequestBuilder {
 		return this;
 	}
 
-	public HistogramFacetRequestBuilder timeUnit(DateHistogramInterval timeUnit) {
+	public HistogramFacetRequestBuilder timeUnit(TimeUnit timeUnit) {
 		result.setTimeUnit(timeUnit);
 		return this;
 	}
@@ -55,4 +53,4 @@ public class HistogramFacetRequestBuilder {
 		result.setApplyQueryFilter(true);
 		return this;
 	}
-}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/request/NativeFacetRequest.java

@@ -13,31 +13,36 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.elasticsearch.core.facet.request;
 
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
+import org.elasticsearch.search.facet.FacetBuilder;
 import org.springframework.data.elasticsearch.core.facet.FacetRequest;
 
-
 /**
  * @author Artur Konczak
  * @author Mohsin Husen
  */
-@Deprecated
 public class NativeFacetRequest implements FacetRequest {
 
-	public NativeFacetRequest() {
-		throw new UnsupportedOperationException("Native Facet are not supported in Elasticsearch 2.x - use Aggregation");
+	private FacetBuilder facet;
+	private boolean applyQueryFilter;
+
+	public NativeFacetRequest(FacetBuilder facet) {
+		this(facet, false);
+	}
+
+	public NativeFacetRequest(FacetBuilder facet, boolean applyQueryFilter) {
+		this.facet = facet;
+		this.applyQueryFilter = applyQueryFilter;
 	}
 
 	@Override
-	public AbstractAggregationBuilder getFacet() {
-		return null;
+	public FacetBuilder getFacet() {
+		return facet;
 	}
 
 	@Override
 	public boolean applyQueryFilter() {
-		return false;
+		return applyQueryFilter;
 	}
 }

src/main/java/org/springframework/data/elasticsearch/core/facet/request/RangeFacetRequest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2017 the original author or authors.
+ * Copyright 2014 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.
@@ -13,35 +13,31 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.elasticsearch.core.facet.request;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.facet.FacetBuilder;
+import org.elasticsearch.search.facet.FacetBuilders;
+import org.elasticsearch.search.facet.range.RangeFacetBuilder;
 import org.springframework.data.elasticsearch.core.facet.AbstractFacetRequest;
 import org.springframework.util.Assert;
 
-
 /**
  * Range facet for numeric fields
  *
  * @author Artur Konczak
  * @author Akos Bordas
  */
-@Deprecated
 public class RangeFacetRequest extends AbstractFacetRequest {
 
-	public static final String RANGE_INTERNAL_SUM = "range-internal-sum";
 	private String field;
 	private String keyField;
 	private String valueField;
 
-	private List<Entry> entries = new ArrayList<>();
+	private List<Entry> entries = new ArrayList<Entry>();
 
 	public RangeFacetRequest(String name) {
 		super(name);
@@ -61,7 +57,7 @@ public class RangeFacetRequest extends AbstractFacetRequest {
 	}
 
 	public void range(String from, String to) {
-		throw new UnsupportedOperationException("Native Facet are not supported in Elasticsearch 2.x - use Aggregation");
+		entries.add(new StringEntry(from, to));
 	}
 
 	public void addRange(Double from, Double to) {
@@ -69,28 +65,32 @@ public class RangeFacetRequest extends AbstractFacetRequest {
 	}
 
 	public void addRange(String from, String to) {
-		throw new UnsupportedOperationException("Native Facet are not supported in Elasticsearch 2.x - use Aggregation");
+		entries.add(new StringEntry(from, to));
 	}
 
 	@Override
-	public AbstractAggregationBuilder getFacet() {
+	public FacetBuilder getFacet() {
 		Assert.notNull(getName(), "Facet name can't be a null !!!");
+		Assert.isTrue(StringUtils.isNotBlank(field) || StringUtils.isNotBlank(keyField) && StringUtils.isNotBlank(valueField), "Please select field or key field and value field !!!");
 
-		RangeAggregationBuilder rangeBuilder = AggregationBuilders.range(getName());
-		final String field = StringUtils.isNotBlank(keyField) ? keyField : this.field;
-		rangeBuilder.field(field);
+		RangeFacetBuilder builder = FacetBuilders.rangeFacet(getName());
+		if (StringUtils.isNotBlank(keyField)) {
+			builder.keyField(keyField).valueField(valueField);
+		} else {
+			builder.field(field);
+		}
 
 		for (Entry entry : entries) {
-			DoubleEntry doubleEntry = (DoubleEntry) entry;
-			rangeBuilder.addRange(validateValue(doubleEntry.getFrom(), Double.NEGATIVE_INFINITY), validateValue(doubleEntry.getTo(), Double.POSITIVE_INFINITY));
+			if (entry instanceof DoubleEntry) {
+				DoubleEntry doubleEntry = (DoubleEntry) entry;
+				builder.addRange(validateValue(doubleEntry.getFrom(), Double.NEGATIVE_INFINITY), validateValue(doubleEntry.getTo(), Double.POSITIVE_INFINITY));
+			} else {
+				StringEntry stringEntry = (StringEntry) entry;
+				builder.addRange(stringEntry.getFrom(), stringEntry.getTo());
+			}
 		}
 
-		rangeBuilder.subAggregation(AggregationBuilders.extendedStats(INTERNAL_STATS).field(field));
-		if(StringUtils.isNotBlank(valueField)){
-			rangeBuilder.subAggregation(AggregationBuilders.sum(RANGE_INTERNAL_SUM).field(valueField));
-		}
-
-		return rangeBuilder;
+		return builder;
 	}
 
 	private double validateValue(Double value, double defaultValue) {
@@ -130,4 +130,3 @@ public class RangeFacetRequest extends AbstractFacetRequest {
 		}
 	}
 }
-

src/main/java/org/springframework/data/elasticsearch/core/facet/request/RangeFacetRequestBuilder.java

@@ -13,18 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.elasticsearch.core.facet.request;
 
 import org.springframework.data.elasticsearch.core.facet.FacetRequest;
 
-
 /**
  * Basic range facet
  *
  * @author Artur Konczak
  */
-@Deprecated
 public class RangeFacetRequestBuilder {
 
 	RangeFacetRequest result;
@@ -82,4 +79,4 @@ public class RangeFacetRequestBuilder {
 	public FacetRequest build() {
 		return result;
 	}
-}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/request/StatisticalFacetRequest.java

@@ -13,20 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.elasticsearch.core.facet.request;
 
+import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
+import org.elasticsearch.search.facet.FacetBuilder;
+import org.elasticsearch.search.facet.FacetBuilders;
+import org.elasticsearch.search.facet.statistical.StatisticalFacetBuilder;
 import org.springframework.data.elasticsearch.core.facet.AbstractFacetRequest;
 import org.springframework.util.Assert;
 
-
 /**
  * @author Petar Tahchiev
  */
-@Deprecated
 public class StatisticalFacetRequest extends AbstractFacetRequest {
 
 	private String field;
@@ -42,12 +41,20 @@ public class StatisticalFacetRequest extends AbstractFacetRequest {
 	}
 
 	public void setFields(String... fields) {
-		throw new UnsupportedOperationException("Native Facet are not supported in Elasticsearch 2.x - use Aggregation");
+		this.fields = fields;
 	}
 
-	public AbstractAggregationBuilder getFacet() {
+	public FacetBuilder getFacet() {
 		Assert.notNull(getName(), "Facet name can't be a null !!!");
 		Assert.isTrue(StringUtils.isNotBlank(field) && fields == null, "Please select field or fields on which to build the facets !!!");
-		return AggregationBuilders.extendedStats(getName()).field(field);
+
+		StatisticalFacetBuilder builder = FacetBuilders.statisticalFacet(getName());
+		if (ArrayUtils.isNotEmpty(fields)) {
+			builder.fields(fields);
+		} else {
+			builder.field(field);
+		}
+
+		return builder;
 	}
-}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/request/StatisticalFacetRequestBuilder.java

@@ -13,16 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.elasticsearch.core.facet.request;
 
 import org.springframework.data.elasticsearch.core.facet.FacetRequest;
 
-
 /**
  * @author Petar Tahchiev
  */
-@Deprecated
 public class StatisticalFacetRequestBuilder {
 
 	StatisticalFacetRequest result;
@@ -49,4 +46,4 @@ public class StatisticalFacetRequestBuilder {
 	public FacetRequest build() {
 		return result;
 	}
-}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/request/TermFacetOrder.java

@@ -19,7 +19,6 @@ package org.springframework.data.elasticsearch.core.facet.request;
  * @author Artur Konczak
  * @author Mohsin Husen
  */
-@Deprecated
 public enum TermFacetOrder {
 
 	ascTerm, descTerm, ascCount, descCount;

src/main/java/org/springframework/data/elasticsearch/core/facet/request/TermFacetRequest.java

@@ -13,43 +13,37 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.elasticsearch.core.facet.request;
 
 import org.apache.commons.lang.ArrayUtils;
 import org.apache.commons.lang.StringUtils;
-import org.apache.lucene.util.automaton.RegExp;
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.terms.Terms;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
-import org.elasticsearch.search.aggregations.bucket.terms.support.IncludeExclude;
+import org.elasticsearch.search.facet.FacetBuilder;
+import org.elasticsearch.search.facet.FacetBuilders;
+import org.elasticsearch.search.facet.terms.TermsFacet;
+import org.elasticsearch.search.facet.terms.TermsFacetBuilder;
 import org.springframework.data.elasticsearch.core.facet.AbstractFacetRequest;
 import org.springframework.util.Assert;
 
-
 /**
  * Term facet
  *
  * @author Artur Konczak
  */
-@Deprecated
 public class TermFacetRequest extends AbstractFacetRequest {
 
 	private String[] fields;
-	private String[] excludeTerms;
+	private Object[] excludeTerms;
 	private int size = 10;
 	private TermFacetOrder order = TermFacetOrder.descCount;
 	private boolean allTerms = false;
 	private String regex = null;
+	private int regexFlag = 0;
 
 	public TermFacetRequest(String name) {
 		super(name);
 	}
 
 	public void setFields(String... fields) {
-		Assert.isTrue(ArrayUtils.isNotEmpty(fields), "Term agg need one field only");
-		Assert.isTrue(ArrayUtils.getLength(fields) == 1, "Term agg need one field only");
 		this.fields = fields;
 	}
 
@@ -62,7 +56,7 @@ public class TermFacetRequest extends AbstractFacetRequest {
 		this.order = order;
 	}
 
-	public void setExcludeTerms(String... excludeTerms) {
+	public void setExcludeTerms(Object... excludeTerms) {
 		this.excludeTerms = excludeTerms;
 	}
 
@@ -74,36 +68,41 @@ public class TermFacetRequest extends AbstractFacetRequest {
 		this.regex = regex;
 	}
 
-	@Override
-	public AbstractAggregationBuilder getFacet() {
-		Assert.notEmpty(fields, "Please select at last one field !!!");
-		final TermsAggregationBuilder termsBuilder = AggregationBuilders.terms(getName()).field(fields[0]).size(this.size);
+	public void setRegex(String regex, int regexFlag) {
+		this.regex = regex;
+		this.regexFlag = regexFlag;
+	}
 
+	@Override
+	public FacetBuilder getFacet() {
+		Assert.notEmpty(fields, "Please select at last one field !!!");
+		TermsFacetBuilder builder = FacetBuilders.termsFacet(getName()).fields(fields).size(size);
 		switch (order) {
+
 			case descTerm:
-				termsBuilder.order(Terms.Order.term(false));
+				builder.order(TermsFacet.ComparatorType.REVERSE_TERM);
 				break;
 			case ascTerm:
-				termsBuilder.order(Terms.Order.term(true));
+				builder.order(TermsFacet.ComparatorType.TERM);
 				break;
-			case descCount:
-				termsBuilder.order(Terms.Order.count(false));
+			case ascCount:
+				builder.order(TermsFacet.ComparatorType.REVERSE_COUNT);
 				break;
 			default:
-				termsBuilder.order(Terms.Order.count(true));
+				builder.order(TermsFacet.ComparatorType.COUNT);
 		}
 		if (ArrayUtils.isNotEmpty(excludeTerms)) {
-			termsBuilder.includeExclude(new IncludeExclude(null,excludeTerms));
+			builder.exclude(excludeTerms);
 		}
 
 		if (allTerms) {
-			termsBuilder.size(Integer.MAX_VALUE);
+			builder.allTerms(allTerms);
 		}
 
 		if (StringUtils.isNotBlank(regex)) {
-			termsBuilder.includeExclude(new IncludeExclude(new RegExp(regex),null));
+			builder.regex(regex, regexFlag);
 		}
 
-		return termsBuilder;
+		return builder;
 	}
-}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/request/TermFacetRequestBuilder.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.elasticsearch.core.facet.request;
 
 import org.springframework.data.elasticsearch.core.facet.FacetRequest;
@@ -23,7 +22,6 @@ import org.springframework.data.elasticsearch.core.facet.FacetRequest;
  *
  * @author Artur Konczak
  */
-@Deprecated
 public class TermFacetRequestBuilder {
 
 	private TermFacetRequest result;
@@ -42,7 +40,7 @@ public class TermFacetRequestBuilder {
 		return this;
 	}
 
-	public TermFacetRequestBuilder excludeTerms(String... terms) {
+	public TermFacetRequestBuilder excludeTerms(Object... terms) {
 		result.setExcludeTerms(terms);
 		return this;
 	}
@@ -57,6 +55,11 @@ public class TermFacetRequestBuilder {
 		return this;
 	}
 
+	public TermFacetRequestBuilder regex(String regex, int regexFlag) {
+		result.setRegex(regex, regexFlag);
+		return this;
+	}
+
 	public TermFacetRequestBuilder ascTerm() {
 		result.setOrder(TermFacetOrder.ascTerm);
 		return this;
@@ -85,4 +88,4 @@ public class TermFacetRequestBuilder {
 	public FacetRequest build() {
 		return result;
 	}
-}
+}

src/main/java/org/springframework/data/elasticsearch/core/facet/result/HistogramResult.java

@@ -23,7 +23,6 @@ import org.springframework.data.elasticsearch.core.facet.FacetType;
 /**
  * @author Artur Konczak
  */
-@Deprecated
 public class HistogramResult extends AbstractFacetResult {
 
 	private List<IntervalUnit> terms;

src/main/java/org/springframework/data/elasticsearch/core/facet/result/IntervalUnit.java

@@ -26,7 +26,6 @@ import java.util.Date;
  * @author Artur Konczak
  * @author Jonathan Yan
  */
-@Deprecated
 public class IntervalUnit {
 
 	private static final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");

src/main/java/org/springframework/data/elasticsearch/core/facet/result/Range.java

@@ -23,7 +23,6 @@ package org.springframework.data.elasticsearch.core.facet.result;
  * @author Artur Konczak
  * @author Jonathan Yan
  */
-@Deprecated
 public class Range {
 
 	private Double from;

src/main/java/org/springframework/data/elasticsearch/core/facet/result/RangeResult.java

@@ -28,7 +28,6 @@ import org.springframework.data.elasticsearch.core.facet.FacetType;
  * @author Artur Konczak
  * @author Jonathan Yan
  */
-@Deprecated
 public class RangeResult extends AbstractFacetResult {
 
 	private List<Range> ranges;

src/main/java/org/springframework/data/elasticsearch/core/facet/result/StatisticalResult.java

@@ -21,7 +21,6 @@ import org.springframework.data.elasticsearch.core.facet.FacetType;
 /**
  * @author Petar Tahchiev
  */
-@Deprecated
 public class StatisticalResult extends AbstractFacetResult {
 
 	private long count;

src/main/java/org/springframework/data/elasticsearch/core/facet/result/Term.java

@@ -23,13 +23,12 @@ package org.springframework.data.elasticsearch.core.facet.result;
  * @author Artur Konczak
  * @author Jonathan Yan
  */
-@Deprecated
 public class Term {
 
 	private String term;
-	private long count;
+	private int count;
 
-	public Term(String term, long count) {
+	public Term(String term, int count) {
 		this.term = term;
 		this.count = count;
 	}
@@ -38,7 +37,7 @@ public class Term {
 		return term;
 	}
 
-	public long getCount() {
+	public int getCount() {
 		return count;
 	}
 }

src/main/java/org/springframework/data/elasticsearch/core/facet/result/TermResult.java

@@ -27,37 +27,17 @@ import org.springframework.data.elasticsearch.core.facet.FacetType;
  * @author Mohsin Husen
  * @author Artur Konczak
  * @author Jonathan Yan
- * @author Matija Obreza
  */
-@Deprecated
 public class TermResult extends AbstractFacetResult {
 
 	private List<Term> terms;
-	private long total;
-	private long other;
-	private long missing;
 
-	public TermResult(String name, List<Term> terms, long total, long other, long missing) {
+	public TermResult(String name, List<Term> terms) {
 		super(name, FacetType.term);
 		this.terms = terms;
-		this.total = total;
-		this.other = other;
-		this.missing = missing;
 	}
 
 	public List<Term> getTerms() {
 		return terms;
 	}
-	
-	public long getTotal() {
-		return total;
-	}
-	
-	public long getOther() {
-		return other;
-	}
-	
-	public long getMissing() {
-		return missing;
-	}
 }

src/main/java/org/springframework/data/elasticsearch/core/geo/CustomGeoModule.java

@@ -1,44 +0,0 @@
-package org.springframework.data.elasticsearch.core.geo;
-
-import java.io.IOException;
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.Version;
-import com.fasterxml.jackson.databind.DeserializationContext;
-import com.fasterxml.jackson.databind.JsonDeserializer;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import com.fasterxml.jackson.databind.module.SimpleModule;
-import org.springframework.data.geo.Point;
-
-/**
- * @author Artur Konaczak
- */
-public class CustomGeoModule extends SimpleModule {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * Creates a new {@link org.springframework.data.elasticsearch.core.geo.CustomGeoModule} registering serializers and deserializers for spring data commons geo-spatial types.
-	 */
-	public CustomGeoModule() {
-
-		super("Spring Data Elasticsearch Geo", new Version(1, 0, 0, null, "org.springframework.data.elasticsearch", "spring-data-elasticsearch-geo"));
-		addSerializer(Point.class, new PointSerializer());
-		addDeserializer(Point.class, new PointDeserializer());
-	}
-}
-
-class PointSerializer extends JsonSerializer<Point> {
-	@Override
-	public void serialize(Point value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
-		gen.writeObject(GeoPoint.fromPoint(value));
-	}
-}
-
-class PointDeserializer extends JsonDeserializer<Point> {
-	@Override
-	public Point deserialize(JsonParser p, DeserializationContext context) throws IOException {
-		return GeoPoint.toPoint(p.readValueAs(GeoPoint.class));
-	}
-}

src/main/java/org/springframework/data/elasticsearch/core/geo/GeoBox.java

@@ -15,8 +15,6 @@
  */
 package org.springframework.data.elasticsearch.core.geo;
 
-import org.springframework.data.geo.Box;
-
 /**
  * Geo bbox used for #{@link org.springframework.data.elasticsearch.core.query.Criteria}.
  *
@@ -39,18 +37,4 @@ public class GeoBox {
 	public GeoPoint getBottomRight() {
 		return bottomRight;
 	}
-
-	/**
-	 * return a {@link org.springframework.data.elasticsearch.core.geo.GeoBox}
-	 * from a {@link org.springframework.data.geo.Box}.
-	 *
-	 * @param box {@link org.springframework.data.geo.Box} to use
-	 * @return a {@link org.springframework.data.elasticsearch.core.geo.GeoBox}
-	 */
-	public static GeoBox fromBox(Box box) {
-		GeoPoint topLeft = GeoPoint.fromPoint(box.getFirst());
-		GeoPoint bottomRight = GeoPoint.fromPoint(box.getSecond());
-
-		return new GeoBox(topLeft, bottomRight);
-	}
 }

src/main/java/org/springframework/data/elasticsearch/core/geo/GeoPoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013 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,13 +15,10 @@
  */
 package org.springframework.data.elasticsearch.core.geo;
 
-import org.springframework.data.geo.Point;
-
 /**
  * geo-location used for #{@link org.springframework.data.elasticsearch.core.query.Criteria}.
  *
  * @author Franck Marchand
- * @author Mohsin Husen
  */
 public class GeoPoint {
 
@@ -44,20 +41,4 @@ public class GeoPoint {
 	public double getLon() {
 		return lon;
 	}
-
-	/**
-	 * build a GeoPoint from a {@link org.springframework.data.geo.Point}
-	 *
-	 * @param point {@link org.springframework.data.geo.Point}
-	 * @return a {@link org.springframework.data.elasticsearch.core.geo.GeoPoint}
-	 */
-	public static GeoPoint fromPoint(Point point) {
-		return new GeoPoint(point.getX(), point.getY());
-	}
-
-	public static Point toPoint(GeoPoint point) {
-		return new Point(point.getLat(), point.getLon());
-	}
 }
-
-

src/main/java/org/springframework/data/elasticsearch/core/mapping/ElasticsearchPersistentEntity.java

@@ -1,52 +1,48 @@
-/*
- * Copyright 2013-2017 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
- *
- *      http://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.mapping;
-
-import org.springframework.data.mapping.PersistentEntity;
-
-/**
- * ElasticsearchPersistentEntity
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Mark Paluch
- */
-public interface ElasticsearchPersistentEntity<T> extends PersistentEntity<T, ElasticsearchPersistentProperty> {
-
-	String getIndexName();
-
-	String getIndexType();
-
-	short getShards();
-
-	short getReplicas();
-
-	boolean isUseServerConfiguration();
-
-	String getRefreshInterval();
-
-	String getIndexStoreType();
-
-	ElasticsearchPersistentProperty getVersionProperty();
-
-	String getParentType();
-
-	ElasticsearchPersistentProperty getParentIdProperty();
-
-	String settingPath();
-
-	boolean isCreateIndexAndMapping();
-}
+/*
+ * Copyright 2013-2014 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
+ *
+ *      http://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.mapping;
+
+import org.springframework.data.mapping.PersistentEntity;
+
+/**
+ * ElasticsearchPersistentEntity
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public interface ElasticsearchPersistentEntity<T> extends PersistentEntity<T, ElasticsearchPersistentProperty> {
+
+	String getIndexName();
+
+	String getIndexType();
+
+	short getShards();
+
+	short getReplicas();
+
+	String getRefreshInterval();
+
+	String getIndexStoreType();
+
+	ElasticsearchPersistentProperty getVersionProperty();
+
+	String getParentType();
+
+	ElasticsearchPersistentProperty getParentIdProperty();
+
+	String settingPath();
+}

src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchMappingContext.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013 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,11 +15,10 @@
  */
 package org.springframework.data.elasticsearch.core.mapping;
 
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+
 import org.springframework.data.mapping.context.AbstractMappingContext;
-import org.springframework.data.mapping.model.Property;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 import org.springframework.data.util.TypeInformation;
 
@@ -28,31 +27,19 @@ import org.springframework.data.util.TypeInformation;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Mark Paluch
  */
-public class SimpleElasticsearchMappingContext extends
-		AbstractMappingContext<SimpleElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> implements ApplicationContextAware {
 
-	private ApplicationContext context;
+public class SimpleElasticsearchMappingContext extends
+		AbstractMappingContext<SimpleElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> {
 
 	@Override
 	protected <T> SimpleElasticsearchPersistentEntity<?> createPersistentEntity(TypeInformation<T> typeInformation) {
-		final SimpleElasticsearchPersistentEntity<T> persistentEntity = new SimpleElasticsearchPersistentEntity<>(
-				typeInformation);
-		if (context != null) {
-			persistentEntity.setApplicationContext(context);
-		}
-		return persistentEntity;
+		return new SimpleElasticsearchPersistentEntity<T>(typeInformation);
 	}
 
 	@Override
-	protected ElasticsearchPersistentProperty createPersistentProperty(Property property,
-			SimpleElasticsearchPersistentEntity<?> owner, SimpleTypeHolder simpleTypeHolder) {
-		return new SimpleElasticsearchPersistentProperty(property, owner, simpleTypeHolder);
-	}
-
-	@Override
-	public void setApplicationContext(ApplicationContext context) throws BeansException {
-		this.context = context;
+	protected ElasticsearchPersistentProperty createPersistentProperty(Field field, PropertyDescriptor descriptor,
+																	   SimpleElasticsearchPersistentEntity<?> owner, SimpleTypeHolder simpleTypeHolder) {
+		return new SimpleElasticsearchPersistentProperty(field, descriptor, owner, simpleTypeHolder);
 	}
 }

src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentEntity.java

@@ -1,171 +1,147 @@
-/*
- * Copyright 2013-2017 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
- *
- *      http://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.mapping;
-
-import static org.springframework.util.StringUtils.*;
-
-import java.util.Locale;
-import java.util.Optional;
-
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.expression.BeanFactoryAccessor;
-import org.springframework.context.expression.BeanFactoryResolver;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Parent;
-import org.springframework.data.elasticsearch.annotations.Setting;
-import org.springframework.data.mapping.model.BasicPersistentEntity;
-import org.springframework.data.util.TypeInformation;
-import org.springframework.expression.Expression;
-import org.springframework.expression.ParserContext;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.expression.spel.support.StandardEvaluationContext;
-import org.springframework.util.Assert;
-
-/**
- * Elasticsearch specific {@link org.springframework.data.mapping.PersistentEntity} implementation holding
- *
- * @param <T>
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Mark Paluch
- */
-public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntity<T, ElasticsearchPersistentProperty>
-		implements ElasticsearchPersistentEntity<T>, ApplicationContextAware {
-
-	private final StandardEvaluationContext context;
-	private final SpelExpressionParser parser;
-
-	private String indexName;
-	private String indexType;
-	private boolean useServerConfiguration;
-	private short shards;
-	private short replicas;
-	private String refreshInterval;
-	private String indexStoreType;
-	private String parentType;
-	private ElasticsearchPersistentProperty parentIdProperty;
-	private String settingPath;
-	private boolean createIndexAndMapping;
-
-	public SimpleElasticsearchPersistentEntity(TypeInformation<T> typeInformation) {
-		super(typeInformation);
-		this.context = new StandardEvaluationContext();
-		this.parser = new SpelExpressionParser();
-
-		Class<T> clazz = typeInformation.getType();
-		if (clazz.isAnnotationPresent(Document.class)) {
-			Document document = clazz.getAnnotation(Document.class);
-			Assert.hasText(document.indexName(),
-					" Unknown indexName. Make sure the indexName is defined. e.g @Document(indexName=\"foo\")");
-			this.indexName = document.indexName();
-			this.indexType = hasText(document.type()) ? document.type() : clazz.getSimpleName().toLowerCase(Locale.ENGLISH);
-			this.useServerConfiguration = document.useServerConfiguration();
-			this.shards = document.shards();
-			this.replicas = document.replicas();
-			this.refreshInterval = document.refreshInterval();
-			this.indexStoreType = document.indexStoreType();
-			this.createIndexAndMapping = document.createIndex();
-		}
-		if (clazz.isAnnotationPresent(Setting.class)) {
-			this.settingPath = typeInformation.getType().getAnnotation(Setting.class).settingPath();
-		}
-	}
-
-	@Override
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		context.addPropertyAccessor(new BeanFactoryAccessor());
-		context.setBeanResolver(new BeanFactoryResolver(applicationContext));
-		context.setRootObject(applicationContext);
-	}
-
-	@Override
-	public String getIndexName() {
-		Expression expression = parser.parseExpression(indexName, ParserContext.TEMPLATE_EXPRESSION);
-		return expression.getValue(context, String.class);
-	}
-
-	@Override
-	public String getIndexType() {
-		Expression expression = parser.parseExpression(indexType, ParserContext.TEMPLATE_EXPRESSION);
-		return expression.getValue(context, String.class);
-	}
-
-	@Override
-	public String getIndexStoreType() {
-		return indexStoreType;
-	}
-
-	@Override
-	public short getShards() {
-		return shards;
-	}
-
-	@Override
-	public short getReplicas() {
-		return replicas;
-	}
-
-	@Override
-	public boolean isUseServerConfiguration() {
-		return useServerConfiguration;
-	}
-
-	@Override
-	public String getRefreshInterval() {
-		return refreshInterval;
-	}
-
-	@Override
-	public String getParentType() {
-		return parentType;
-	}
-
-	@Override
-	public ElasticsearchPersistentProperty getParentIdProperty() {
-		return parentIdProperty;
-	}
-
-	@Override
-	public String settingPath() {
-		return settingPath;
-	}
-
-	@Override
-	public boolean isCreateIndexAndMapping() {
-		return createIndexAndMapping;
-	}
-
-	@Override
-	public void addPersistentProperty(ElasticsearchPersistentProperty property) {
-		super.addPersistentProperty(property);
-
-		Parent annotation = property.findAnnotation(Parent.class);
-
-		if (annotation != null) {
-			Assert.isNull(this.parentIdProperty, "Only one field can hold a @Parent annotation");
-			Assert.isNull(this.parentType, "Only one field can hold a @Parent annotation");
-			Assert.isTrue(property.getType() == String.class, "Parent ID property should be String");
-			this.parentIdProperty = property;
-			this.parentType = annotation.type();
-		}
-
-		if (property.isVersionProperty()) {
-			Assert.isTrue(property.getType() == Long.class, "Version property should be Long");
-		}
-	}
-}
+/*
+ * Copyright 2013-2014 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
+ *
+ *      http://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.mapping;
+
+import static org.springframework.util.StringUtils.*;
+
+import java.util.Locale;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.expression.BeanFactoryAccessor;
+import org.springframework.context.expression.BeanFactoryResolver;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.Parent;
+import org.springframework.data.elasticsearch.annotations.Setting;
+import org.springframework.data.mapping.model.BasicPersistentEntity;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.util.Assert;
+
+/**
+ * Elasticsearch specific {@link org.springframework.data.mapping.PersistentEntity} implementation holding
+ *
+ * @param <T>
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntity<T, ElasticsearchPersistentProperty>
+		implements ElasticsearchPersistentEntity<T>, ApplicationContextAware {
+
+	private final StandardEvaluationContext context;
+	private String indexName;
+	private String indexType;
+	private short shards;
+	private short replicas;
+	private String refreshInterval;
+	private String indexStoreType;
+	private String parentType;
+	private ElasticsearchPersistentProperty parentIdProperty;
+	private String settingPath;
+
+	public SimpleElasticsearchPersistentEntity(TypeInformation<T> typeInformation) {
+		super(typeInformation);
+		this.context = new StandardEvaluationContext();
+		Class<T> clazz = typeInformation.getType();
+		if (clazz.isAnnotationPresent(Document.class)) {
+			Document document = clazz.getAnnotation(Document.class);
+			Assert.hasText(document.indexName(),
+					" Unknown indexName. Make sure the indexName is defined. e.g @Document(indexName=\"foo\")");
+			this.indexName = typeInformation.getType().getAnnotation(Document.class).indexName();
+			this.indexType = hasText(document.type()) ? document.type() : clazz.getSimpleName().toLowerCase(Locale.ENGLISH);
+			this.shards = typeInformation.getType().getAnnotation(Document.class).shards();
+			this.replicas = typeInformation.getType().getAnnotation(Document.class).replicas();
+			this.refreshInterval = typeInformation.getType().getAnnotation(Document.class).refreshInterval();
+			this.indexStoreType = typeInformation.getType().getAnnotation(Document.class).indexStoreType();
+		}
+		if (clazz.isAnnotationPresent(Setting.class)) {
+			this.settingPath = typeInformation.getType().getAnnotation(Setting.class).settingPath();
+		}
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		context.addPropertyAccessor(new BeanFactoryAccessor());
+		context.setBeanResolver(new BeanFactoryResolver(applicationContext));
+		context.setRootObject(applicationContext);
+	}
+
+	@Override
+	public String getIndexName() {
+		return indexName;
+	}
+
+	@Override
+	public String getIndexType() {
+		return indexType;
+	}
+
+	@Override
+	public String getIndexStoreType() {
+		return indexStoreType;
+	}
+
+	@Override
+	public short getShards() {
+		return shards;
+	}
+
+	@Override
+	public short getReplicas() {
+		return replicas;
+	}
+
+	@Override
+	public String getRefreshInterval() {
+		return refreshInterval;
+	}
+
+	@Override
+	public String getParentType() {
+		return parentType;
+	}
+
+	@Override
+	public ElasticsearchPersistentProperty getParentIdProperty() {
+		return parentIdProperty;
+	}
+
+	@Override
+	public String settingPath() {
+		return settingPath;
+	}
+
+	@Override
+	public void addPersistentProperty(ElasticsearchPersistentProperty property) {
+		super.addPersistentProperty(property);
+
+		if (property.getField() != null) {
+			Parent parent = property.getField().getAnnotation(Parent.class);
+			if (parent != null) {
+				Assert.isNull(this.parentIdProperty, "Only one field can hold a @Parent annotation");
+				Assert.isNull(this.parentType, "Only one field can hold a @Parent annotation");
+				Assert.isTrue(property.getType() == String.class, "Parent ID property should be String");
+				this.parentIdProperty = property;
+				this.parentType = parent.type();
+			}
+		}
+
+		if (property.isVersionProperty()) {
+			Assert.isTrue(property.getType() == Long.class, "Version property should be Long");
+		}
+	}
+}

src/main/java/org/springframework/data/elasticsearch/core/mapping/SimpleElasticsearchPersistentProperty.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013 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,13 +15,14 @@
  */
 package org.springframework.data.elasticsearch.core.mapping;
 
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
 import java.util.HashSet;
 import java.util.Set;
 
 import org.springframework.data.mapping.Association;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.model.AnnotationBasedPersistentProperty;
-import org.springframework.data.mapping.model.Property;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 
 /**
@@ -29,13 +30,12 @@ import org.springframework.data.mapping.model.SimpleTypeHolder;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Mark Paluch
  */
 public class SimpleElasticsearchPersistentProperty extends
 		AnnotationBasedPersistentProperty<ElasticsearchPersistentProperty> implements ElasticsearchPersistentProperty {
 
-	private static final Set<Class<?>> SUPPORTED_ID_TYPES = new HashSet<>();
-	private static final Set<String> SUPPORTED_ID_PROPERTY_NAMES = new HashSet<>();
+	private static final Set<Class<?>> SUPPORTED_ID_TYPES = new HashSet<Class<?>>();
+	private static final Set<String> SUPPORTED_ID_PROPERTY_NAMES = new HashSet<String>();
 
 	static {
 		SUPPORTED_ID_TYPES.add(String.class);
@@ -43,19 +43,19 @@ public class SimpleElasticsearchPersistentProperty extends
 		SUPPORTED_ID_PROPERTY_NAMES.add("documentId");
 	}
 
-	public SimpleElasticsearchPersistentProperty(Property property,
-			PersistentEntity<?, ElasticsearchPersistentProperty> owner, SimpleTypeHolder simpleTypeHolder) {
-		super(property, owner, simpleTypeHolder);
+	public SimpleElasticsearchPersistentProperty(Field field, PropertyDescriptor propertyDescriptor,
+												 PersistentEntity<?, ElasticsearchPersistentProperty> owner, SimpleTypeHolder simpleTypeHolder) {
+		super(field, propertyDescriptor, owner, simpleTypeHolder);
 	}
 
 	@Override
 	public String getFieldName() {
-		return getProperty().getName();
+		return field.getName();
 	}
 
 	@Override
 	public boolean isIdProperty() {
-		return super.isIdProperty() || SUPPORTED_ID_PROPERTY_NAMES.contains(getFieldName());
+		return super.isIdProperty() || (field != null ? SUPPORTED_ID_PROPERTY_NAMES.contains(getFieldName()) : false);
 	}
 
 	@Override

src/main/java/org/springframework/data/elasticsearch/core/query/AbstractQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013 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,10 +15,12 @@
  */
 package org.springframework.data.elasticsearch.core.query;
 
-import static java.util.Collections.addAll;
+import static org.apache.commons.collections.CollectionUtils.*;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
 import org.elasticsearch.action.search.SearchType;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
@@ -29,16 +31,14 @@ import org.springframework.util.Assert;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Mark Paluch
  */
 abstract class AbstractQuery implements Query {
 
 	protected Pageable pageable = DEFAULT_PAGE;
 	protected Sort sort;
-	protected List<String> indices = new ArrayList<>();
-	protected List<String> types = new ArrayList<>();
-	protected List<String> fields = new ArrayList<>();
-	protected SourceFilter sourceFilter;
+	protected List<String> indices = new ArrayList<String>();
+	protected List<String> types = new ArrayList<String>();
+	protected List<String> fields = new ArrayList<String>();
 	protected float minScore;
 	protected Collection<String> ids;
 	protected String route;
@@ -56,9 +56,7 @@ abstract class AbstractQuery implements Query {
 
 	@Override
 	public final <T extends Query> T setPageable(Pageable pageable) {
-		
-		Assert.notNull(pageable, "Pageable must not be null!");
-		
+		Assert.notNull(pageable);
 		this.pageable = pageable;
 		return (T) this.addSort(pageable.getSort());
 	}
@@ -93,16 +91,6 @@ abstract class AbstractQuery implements Query {
 		return types;
 	}
 
-	@Override
-	public void addSourceFilter(SourceFilter sourceFilter) {
-		this.sourceFilter = sourceFilter;
-	}
-
-	@Override
-	public SourceFilter getSourceFilter() {
-		return sourceFilter;
-	}
-
 	@SuppressWarnings("unchecked")
 	public final <T extends Query> T addSort(Sort sort) {
 		if (sort == null) {

src/main/java/org/springframework/data/elasticsearch/core/query/AliasBuilder.java

@@ -17,7 +17,7 @@ package org.springframework.data.elasticsearch.core.query;
 
 import java.util.Map;
 
-import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.index.query.FilterBuilder;
 
 /**
  * @author Mohsin Husen
@@ -26,7 +26,7 @@ public class AliasBuilder {
 
 	private String indexName;
 	private String aliasName;
-	private QueryBuilder filterBuilder;
+	private FilterBuilder filterBuilder;
 	private Map<String, Object> filter;
 	private String searchRouting;
 	private String indexRouting;
@@ -42,7 +42,7 @@ public class AliasBuilder {
 		return this;
 	}
 
-	public AliasBuilder withFilterBuilder(QueryBuilder filterBuilder) {
+	public AliasBuilder withFilterBuilder(FilterBuilder filterBuilder) {
 		this.filterBuilder = filterBuilder;
 		return this;
 	}

src/main/java/org/springframework/data/elasticsearch/core/query/AliasQuery.java

@@ -17,7 +17,7 @@ package org.springframework.data.elasticsearch.core.query;
 
 import java.util.Map;
 
-import org.elasticsearch.index.query.QueryBuilder;
+import org.elasticsearch.index.query.FilterBuilder;
 
 /**
  * AliasQuery is useful for creating new alias or deleting existing ones
@@ -28,7 +28,7 @@ public class AliasQuery {
 
 	private String indexName;
 	private String aliasName;
-	private QueryBuilder filterBuilder;
+	private FilterBuilder filterBuilder;
 	private Map<String, Object> filter;
 	private String searchRouting;
 	private String indexRouting;
@@ -50,11 +50,11 @@ public class AliasQuery {
 		this.aliasName = aliasName;
 	}
 
-	public QueryBuilder getFilterBuilder() {
+	public FilterBuilder getFilterBuilder() {
 		return filterBuilder;
 	}
 
-	public void setFilterBuilder(QueryBuilder filterBuilder) {
+	public void setFilterBuilder(FilterBuilder filterBuilder) {
 		this.filterBuilder = filterBuilder;
 	}
 

src/main/java/org/springframework/data/elasticsearch/core/query/Criteria.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013 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,9 +21,6 @@ import org.apache.commons.lang.StringUtils;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.elasticsearch.core.geo.GeoBox;
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
-import org.springframework.data.geo.Box;
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.Point;
 import org.springframework.util.Assert;
 
 /**
@@ -36,17 +33,6 @@ import org.springframework.util.Assert;
  */
 public class Criteria {
 
-	@Override
-	public String toString() {
-		return "Criteria{" +
-				"field=" + field.getName() +
-				", boost=" + boost +
-				", negating=" + negating +
-				", queryCriteria=" + StringUtils.join(queryCriteria, '|') +
-				", filterCriteria=" + StringUtils.join(filterCriteria, '|') +
-				'}';
-	}
-
 	public static final String WILDCARD = "*";
 	public static final String CRITERIA_VALUE_SEPERATOR = " ";
 
@@ -57,11 +43,11 @@ public class Criteria {
 	private float boost = Float.NaN;
 	private boolean negating = false;
 
-	private List<Criteria> criteriaChain = new ArrayList<>(1);
+	private List<Criteria> criteriaChain = new ArrayList<Criteria>(1);
 
-	private Set<CriteriaEntry> queryCriteria = new LinkedHashSet<>();
+	private Set<CriteriaEntry> queryCriteria = new LinkedHashSet<CriteriaEntry>();
 
-	private Set<CriteriaEntry> filterCriteria = new LinkedHashSet<>();
+	private Set<CriteriaEntry> filterCriteria = new LinkedHashSet<CriteriaEntry>();
 
 	public Criteria() {
 	}
@@ -83,6 +69,7 @@ public class Criteria {
 	public Criteria(Field field) {
 		Assert.notNull(field, "Field for criteria must not be null");
 		Assert.hasText(field.getName(), "Field.name for criteria must not be null/empty");
+
 		this.criteriaChain.add(this);
 		this.field = field;
 	}
@@ -315,18 +302,7 @@ public class Criteria {
 	 * @return
 	 */
 	public Criteria lessThanEqual(Object upperBound) {
-		if (upperBound == null) {
-			throw new InvalidDataAccessApiUsageException("UpperBound can't be null");
-		}
-		queryCriteria.add(new CriteriaEntry(OperationKey.LESS_EQUAL, upperBound));
-		return this;
-	}
-
-	public Criteria lessThan(Object upperBound) {
-		if (upperBound == null) {
-			throw new InvalidDataAccessApiUsageException("UpperBound can't be null");
-		}
-		queryCriteria.add(new CriteriaEntry(OperationKey.LESS, upperBound));
+		between(null, upperBound);
 		return this;
 	}
 
@@ -337,18 +313,7 @@ public class Criteria {
 	 * @return
 	 */
 	public Criteria greaterThanEqual(Object lowerBound) {
-		if (lowerBound == null) {
-			throw new InvalidDataAccessApiUsageException("LowerBound can't be null");
-		}
-		queryCriteria.add(new CriteriaEntry(OperationKey.GREATER_EQUAL, lowerBound));
-		return this;
-	}
-
-	public Criteria greaterThan(Object lowerBound) {
-		if (lowerBound == null) {
-			throw new InvalidDataAccessApiUsageException("LowerBound can't be null");
-		}
-		queryCriteria.add(new CriteriaEntry(OperationKey.GREATER, lowerBound));
+		between(lowerBound, null);
 		return this;
 	}
 
@@ -359,7 +324,12 @@ public class Criteria {
 	 * @return
 	 */
 	public Criteria in(Object... values) {
-		return in(toCollection(values));
+		if (values.length == 0 || (values.length > 1 && values[1] instanceof Collection)) {
+			throw new InvalidDataAccessApiUsageException("At least one element "
+					+ (values.length > 0 ? ("of argument of type " + values[1].getClass().getName()) : "")
+					+ " has to be present.");
+		}
+		return in(Arrays.asList(values));
 	}
 
 	/**
@@ -374,25 +344,6 @@ public class Criteria {
 		return this;
 	}
 
-	private List<Object> toCollection(Object... values) {
-		if (values.length == 0 || (values.length > 1 && values[1] instanceof Collection)) {
-			throw new InvalidDataAccessApiUsageException("At least one element "
-					+ (values.length > 0 ? ("of argument of type " + values[1].getClass().getName()) : "")
-					+ " has to be present.");
-		}
-		return Arrays.asList(values);
-	}
-
-	public Criteria notIn(Object... values) {
-		return notIn(toCollection(values));
-	}
-
-	public Criteria notIn(Iterable<?> values) {
-		Assert.notNull(values, "Collection of 'NotIn' values must not be null");
-		queryCriteria.add(new CriteriaEntry(OperationKey.NOT_IN, values));
-		return this;
-	}
-
 	/**
 	 * Creates new CriteriaEntry for {@code location WITHIN distance}
 	 *
@@ -409,21 +360,6 @@ public class Criteria {
 		return this;
 	}
 
-	/**
-	 * Creates new CriteriaEntry for {@code location WITHIN distance}
-	 *
-	 * @param location {@link org.springframework.data.geo.Point} center coordinates
-	 * @param distance {@link org.springframework.data.geo.Distance} radius
-	 * .
-	 * @return Criteria the chaind criteria with the new 'within' criteria included.
-	 */
-	public Criteria within(Point location, Distance distance) {
-		Assert.notNull(location, "Location value for near criteria must not be null");
-		Assert.notNull(location, "Distance value for near criteria must not be null");
-		filterCriteria.add(new CriteriaEntry(OperationKey.WITHIN, new Object[]{location, distance}));
-		return this;
-	}
-
 	/**
 	 * Creates new CriteriaEntry for {@code geoLocation WITHIN distance}
 	 *
@@ -454,17 +390,6 @@ public class Criteria {
 		return this;
 	}
 
-	/**
-	 * Creates new CriteriaEntry for {@code location Box bounding box}
-	 *
-	 * @param boundingBox {@link org.springframework.data.elasticsearch.core.geo.GeoBox} bounding box(left top corner + right bottom corner)
-	 * @return Criteria the chaind criteria with the new 'boundingBox' criteria included.
-	 */
-	public Criteria boundedBy(Box boundingBox) {
-		Assert.notNull(boundingBox, "boundingBox value for boundedBy criteria must not be null");
-		filterCriteria.add(new CriteriaEntry(OperationKey.BBOX, new Object[]{boundingBox.getFirst(), boundingBox.getSecond()}));
-		return this;
-	}
 
 	/**
 	 * Creates new CriteriaEntry for bounding box created from points
@@ -494,17 +419,10 @@ public class Criteria {
 		return this;
 	}
 
-	public Criteria boundedBy(Point topLeftPoint, Point bottomRightPoint) {
-		Assert.notNull(topLeftPoint, "topLeftPoint must not be null");
-		Assert.notNull(bottomRightPoint, "bottomRightPoint must not be null");
-		filterCriteria.add(new CriteriaEntry(OperationKey.BBOX, new Object[]{GeoPoint.fromPoint(topLeftPoint), GeoPoint.fromPoint(bottomRightPoint)}));
-		return this;
-	}
-
 	private void assertNoBlankInWildcardedQuery(String searchString, boolean leadingWildcard, boolean trailingWildcard) {
 		if (StringUtils.contains(searchString, CRITERIA_VALUE_SEPERATOR)) {
 			throw new InvalidDataAccessApiUsageException("Cannot constructQuery '" + (leadingWildcard ? "*" : "") + "\""
-					+ searchString + "\"" + (trailingWildcard ? "*" : "") + "'. Use expression or multiple clauses instead.");
+					+ searchString + "\"" + (trailingWildcard ? "*" : "") + "'. Use epxression or mulitple clauses instead.");
 		}
 	}
 
@@ -587,7 +505,7 @@ public class Criteria {
 	}
 
 	public enum OperationKey {
-		EQUALS, CONTAINS, STARTS_WITH, ENDS_WITH, EXPRESSION, BETWEEN, FUZZY, IN, NOT_IN, WITHIN, BBOX, NEAR, LESS, LESS_EQUAL, GREATER, GREATER_EQUAL;
+		EQUALS, CONTAINS, STARTS_WITH, ENDS_WITH, EXPRESSION, BETWEEN, FUZZY, IN, WITHIN, BBOX, NEAR;
 	}
 
 	public static class CriteriaEntry {
@@ -607,13 +525,5 @@ public class Criteria {
 		public Object getValue() {
 			return value;
 		}
-
-		@Override
-		public String toString() {
-			return "CriteriaEntry{" +
-					"key=" + key +
-					", value=" + value +
-					'}';
-		}
 	}
 }

src/main/java/org/springframework/data/elasticsearch/core/query/CriteriaQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013 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.
@@ -23,26 +23,24 @@ import org.springframework.util.Assert;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Mark Paluch
  */
 public class CriteriaQuery extends AbstractQuery {
 
 	private Criteria criteria;
 
-	private CriteriaQuery() {}
+	private CriteriaQuery() {
+	}
 
 	public CriteriaQuery(Criteria criteria) {
-		this(criteria, Pageable.unpaged());
+		this(criteria, null);
 	}
 
 	public CriteriaQuery(Criteria criteria, Pageable pageable) {
-
-		Assert.notNull(criteria, "Criteria must not be null!");
-		Assert.notNull(pageable, "Pageable must not be null!");
-
 		this.criteria = criteria;
 		this.pageable = pageable;
-		this.addSort(pageable.getSort());
+		if (pageable != null) {
+			this.addSort(pageable.getSort());
+		}
 	}
 
 	public static final Query fromQuery(CriteriaQuery source) {

src/main/java/org/springframework/data/elasticsearch/core/query/DeleteQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013 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.
@@ -28,8 +28,6 @@ public class DeleteQuery {
 	private QueryBuilder query;
 	private String index;
 	private String type;
-	private Integer pageSize;
-	private Long scrollTimeInMillis;
 
 	public QueryBuilder getQuery() {
 		return query;
@@ -54,20 +52,4 @@ public class DeleteQuery {
 	public void setType(String type) {
 		this.type = type;
 	}
-
-	public Integer getPageSize() {
-		return pageSize;
-	}
-
-	public void setPageSize(Integer pageSize) {
-		this.pageSize = pageSize;
-	}
-
-	public Long getScrollTimeInMillis() {
-		return scrollTimeInMillis;
-	}
-
-	public void setScrollTimeInMillis(Long scrollTimeInMillis) {
-		this.scrollTimeInMillis = scrollTimeInMillis;
-	}
 }

src/main/java/org/springframework/data/elasticsearch/core/query/FetchSourceFilter.java

@@ -1,42 +0,0 @@
-/*
- * Copyright 2016 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
- *
- *      http://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.query;
-
-/**
- * SourceFilter implementation for providing includes and excludes.
- *
- * @Author Jon Tsiros
- */
-public class FetchSourceFilter implements SourceFilter {
-
-	private final String[] includes;
-	private final String[] excludes;
-
-	public FetchSourceFilter(final String[] includes, final String[] excludes) {
-		this.includes = includes;
-		this.excludes = excludes;
-	}
-
-	@Override
-	public String[] getIncludes() {
-		return includes;
-	}
-
-	@Override
-	public String[] getExcludes() {
-		return excludes;
-	}
-}

src/main/java/org/springframework/data/elasticsearch/core/query/FetchSourceFilterBuilder.java

@@ -1,45 +0,0 @@
-/*
- * Copyright 2016 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
- *
- *      http://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.query;
-
-/**
- * SourceFilter builder for providing includes and excludes.
- *
- * @Author Jon Tsiros
- */
-public class FetchSourceFilterBuilder {
-
-	private String[] includes;
-	private String[] excludes;
-
-	public FetchSourceFilterBuilder withIncludes(String... includes) {
-		this.includes = includes;
-		return this;
-	}
-
-	public FetchSourceFilterBuilder withExcludes(String... excludes) {
-		this.excludes = excludes;
-		return this;
-	}
-
-	public SourceFilter build() {
-		if (includes == null) includes = new String[0];
-		if (excludes == null) excludes = new String[0];
-
-		SourceFilter sourceFilter = new FetchSourceFilter(includes, excludes);
-		return sourceFilter;
-	}
-}

src/main/java/org/springframework/data/elasticsearch/core/query/IndexBoost.java

@@ -1,42 +0,0 @@
-/*
- * Copyright 2016 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
- *
- *      http://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.query;
-
-/**
- * Defines a IndexBoost to be applied on the "indices_boost" query clause
- *
- * @author Thiago Locatelli
- */
-public class IndexBoost {
-
-	private String indexName;
-	private float boost;
-
-	public IndexBoost(String indexName, float boost) {
-		this.indexName = indexName;
-		this.boost = boost;
-	}
-
-	public String getIndexName() {
-		return indexName;
-	}
-
-	public float getBoost() {
-		return boost;
-	}
-
-}

src/main/java/org/springframework/data/elasticsearch/core/query/MoreLikeThisQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013 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,7 +15,7 @@
  */
 package org.springframework.data.elasticsearch.core.query;
 
-import static java.util.Collections.addAll;
+import static org.apache.commons.collections.CollectionUtils.*;
 import static org.springframework.data.elasticsearch.core.query.AbstractQuery.*;
 
 import java.util.ArrayList;
@@ -29,19 +29,20 @@ import org.springframework.data.domain.Pageable;
  * @author Rizwan Idrees
  * @author Mohsin Husen
  */
+
 public class MoreLikeThisQuery {
 
 	private String id;
 	private String indexName;
 	private String type;
-	private List<String> searchIndices = new ArrayList<>();
-	private List<String> searchTypes = new ArrayList<>();
-	private List<String> fields = new ArrayList<>();
+	private List<String> searchIndices = new ArrayList<String>();
+	private List<String> searchTypes = new ArrayList<String>();
+	private List<String> fields = new ArrayList<String>();
 	private String routing;
 	private Float percentTermsToMatch;
 	private Integer minTermFreq;
 	private Integer maxQueryTerms;
-	private List<String> stopWords = new ArrayList<>();
+	private List<String> stopWords = new ArrayList<String>();
 	private Integer minDocFreq;
 	private Integer maxDocFreq;
 	private Integer minWordLen;

src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013 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.
@@ -18,14 +18,12 @@ package org.springframework.data.elasticsearch.core.query;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.elasticsearch.index.query.FilterBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
+import org.elasticsearch.search.highlight.HighlightBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
 import org.springframework.data.elasticsearch.core.facet.FacetRequest;
 
-import java.util.Arrays;
-
 /**
  * NativeSearchQuery
  *
@@ -36,31 +34,28 @@ import java.util.Arrays;
 public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
 
 	private QueryBuilder query;
-	private QueryBuilder filter;
+	private FilterBuilder filter;
 	private List<SortBuilder> sorts;
-    private final List<ScriptField> scriptFields = new ArrayList<>();
 	private List<FacetRequest> facets;
-	private List<AbstractAggregationBuilder> aggregations;
 	private HighlightBuilder.Field[] highlightFields;
-	private List<IndexBoost> indicesBoost;
 
 
 	public NativeSearchQuery(QueryBuilder query) {
 		this.query = query;
 	}
 
-	public NativeSearchQuery(QueryBuilder query, QueryBuilder filter) {
+	public NativeSearchQuery(QueryBuilder query, FilterBuilder filter) {
 		this.query = query;
 		this.filter = filter;
 	}
 
-	public NativeSearchQuery(QueryBuilder query, QueryBuilder filter, List<SortBuilder> sorts) {
+	public NativeSearchQuery(QueryBuilder query, FilterBuilder filter, List<SortBuilder> sorts) {
 		this.query = query;
 		this.filter = filter;
 		this.sorts = sorts;
 	}
 
-	public NativeSearchQuery(QueryBuilder query, QueryBuilder filter, List<SortBuilder> sorts, HighlightBuilder.Field[] highlightFields) {
+	public NativeSearchQuery(QueryBuilder query, FilterBuilder filter, List<SortBuilder> sorts, HighlightBuilder.Field[] highlightFields) {
 		this.query = query;
 		this.filter = filter;
 		this.sorts = sorts;
@@ -71,7 +66,7 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
 		return query;
 	}
 
-	public QueryBuilder getFilter() {
+	public FilterBuilder getFilter() {
 		return filter;
 	}
 
@@ -84,20 +79,9 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
 		return highlightFields;
 	}
 
-    @Override
-    public List<ScriptField> getScriptFields() { return scriptFields; }
-
-    public void setScriptFields(List<ScriptField> scriptFields) {
-        this.scriptFields.addAll(scriptFields);
-    }
-
-    public void addScriptField(ScriptField... scriptField) {
-        scriptFields.addAll(Arrays.asList(scriptField));
-    }
-
 	public void addFacet(FacetRequest facetRequest) {
 		if (facets == null) {
-			facets = new ArrayList<>();
+			facets = new ArrayList<FacetRequest>();
 		}
 		facets.add(facetRequest);
 	}
@@ -110,31 +94,4 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
 	public List<FacetRequest> getFacets() {
 		return facets;
 	}
-
-	@Override
-	public List<AbstractAggregationBuilder> getAggregations() {
-		return aggregations;
-	}
-
-
-	public void addAggregation(AbstractAggregationBuilder aggregationBuilder) {
-		if (aggregations == null) {
-			aggregations = new ArrayList<>();
-		}
-		aggregations.add(aggregationBuilder);
-	}
-
-	public void setAggregations(List<AbstractAggregationBuilder> aggregations) {
-		this.aggregations = aggregations;
-	}
-
-	@Override
-	public List<IndexBoost> getIndicesBoost() {
-		return indicesBoost;
-	}
-
-	public void setIndicesBoost(List<IndexBoost> indicesBoost) {
-		this.indicesBoost = indicesBoost;
-	}
-
 }

src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-2014 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,14 +15,15 @@
  */
 package org.springframework.data.elasticsearch.core.query;
 
-import static org.springframework.util.CollectionUtils.isEmpty;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
 import org.elasticsearch.action.search.SearchType;
+import org.elasticsearch.index.query.FilterBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
+import org.elasticsearch.search.highlight.HighlightBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.elasticsearch.core.facet.FacetRequest;
@@ -33,23 +34,19 @@ import org.springframework.data.elasticsearch.core.facet.FacetRequest;
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Artur Konczak
- * @author Mark Paluch
  */
+
 public class NativeSearchQueryBuilder {
 
 	private QueryBuilder queryBuilder;
-	private QueryBuilder filterBuilder;
-    private List<ScriptField> scriptFields = new ArrayList<>();
-	private List<SortBuilder> sortBuilders = new ArrayList<>();
-	private List<FacetRequest> facetRequests = new ArrayList<>();
-	private List<AbstractAggregationBuilder> aggregationBuilders = new ArrayList<>();
+	private FilterBuilder filterBuilder;
+	private List<SortBuilder> sortBuilders = new ArrayList<SortBuilder>();
+	private List<FacetRequest> facetRequests = new ArrayList<FacetRequest>();
 	private HighlightBuilder.Field[] highlightFields;
-	private Pageable pageable = Pageable.unpaged();
+	private Pageable pageable;
 	private String[] indices;
 	private String[] types;
 	private String[] fields;
-	private SourceFilter sourceFilter;
-	private List<IndexBoost> indicesBoost;
 	private float minScore;
 	private Collection<String> ids;
 	private String route;
@@ -60,7 +57,7 @@ public class NativeSearchQueryBuilder {
 		return this;
 	}
 
-	public NativeSearchQueryBuilder withFilter(QueryBuilder filterBuilder) {
+	public NativeSearchQueryBuilder withFilter(FilterBuilder filterBuilder) {
 		this.filterBuilder = filterBuilder;
 		return this;
 	}
@@ -70,16 +67,6 @@ public class NativeSearchQueryBuilder {
 		return this;
 	}
 
-    public NativeSearchQueryBuilder withScriptField(ScriptField scriptField) {
-        this.scriptFields.add(scriptField);
-        return this;
-    }
-
-	public NativeSearchQueryBuilder addAggregation(AbstractAggregationBuilder aggregationBuilder) {
-		this.aggregationBuilders.add(aggregationBuilder);
-		return this;
-	}
-
 	public NativeSearchQueryBuilder withFacet(FacetRequest facetRequest) {
 		facetRequests.add(facetRequest);
 		return this;
@@ -90,11 +77,6 @@ public class NativeSearchQueryBuilder {
 		return this;
 	}
 
-	public NativeSearchQueryBuilder withIndicesBoost(List<IndexBoost> indicesBoost) {
-		this.indicesBoost = indicesBoost;
-		return this;
-	}
-
 	public NativeSearchQueryBuilder withPageable(Pageable pageable) {
 		this.pageable = pageable;
 		return this;
@@ -115,11 +97,6 @@ public class NativeSearchQueryBuilder {
 		return this;
 	}
 
-	public NativeSearchQueryBuilder withSourceFilter(SourceFilter sourceFilter) {
-				this.sourceFilter = sourceFilter;
-				return this;
-	}
-
 	public NativeSearchQueryBuilder withMinScore(float minScore) {
 		this.minScore = minScore;
 		return this;
@@ -142,7 +119,9 @@ public class NativeSearchQueryBuilder {
 
 	public NativeSearchQuery build() {
 		NativeSearchQuery nativeSearchQuery = new NativeSearchQuery(queryBuilder, filterBuilder, sortBuilders, highlightFields);
-		nativeSearchQuery.setPageable(pageable);
+		if (pageable != null) {
+			nativeSearchQuery.setPageable(pageable);
+		}
 
 		if (indices != null) {
 			nativeSearchQuery.addIndices(indices);
@@ -156,26 +135,10 @@ public class NativeSearchQueryBuilder {
 			nativeSearchQuery.addFields(fields);
 		}
 
-		if (sourceFilter != null) {
-			nativeSearchQuery.addSourceFilter(sourceFilter);
-		}
-
-		if(indicesBoost != null) {
-		    nativeSearchQuery.setIndicesBoost(indicesBoost);
-		}
-
-        if (!isEmpty(scriptFields)) {
-            nativeSearchQuery.setScriptFields(scriptFields);
-        }
-
-		if (!isEmpty(facetRequests)) {
+		if (CollectionUtils.isNotEmpty(facetRequests)) {
 			nativeSearchQuery.setFacets(facetRequests);
 		}
 
-		if (!isEmpty(aggregationBuilders)) {
-			nativeSearchQuery.setAggregations(aggregationBuilders);
-		}
-
 		if (minScore > 0) {
 			nativeSearchQuery.setMinScore(minScore);
 		}

src/main/java/org/springframework/data/elasticsearch/core/query/Query.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013 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.core.query;
 
 import java.util.Collection;
 import java.util.List;
+
 import org.elasticsearch.action.search.SearchType;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -27,12 +28,11 @@ import org.springframework.data.domain.Sort;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Mark Paluch
  */
 public interface Query {
 
-	int DEFAULT_PAGE_SIZE = 10;
-	Pageable DEFAULT_PAGE = PageRequest.of(0, DEFAULT_PAGE_SIZE);
+	public static final int DEFAULT_PAGE_SIZE = 10;
+	public static final Pageable DEFAULT_PAGE = new PageRequest(0, DEFAULT_PAGE_SIZE);
 
 	/**
 	 * restrict result to entries on given page. Corresponds to the 'start' and 'rows' parameter in elasticsearch
@@ -42,6 +42,13 @@ public interface Query {
 	 */
 	<T extends Query> T setPageable(Pageable pageable);
 
+	/**
+	 * Get filter queries if defined
+	 *
+	 * @return
+	 */
+	// List<FilterQuery> getFilterQueries();
+
 	/**
 	 * Get page settings if defined
 	 *
@@ -104,21 +111,6 @@ public interface Query {
 	 */
 	List<String> getFields();
 
-	/**
-	 * Add source filter to be added as part of search request
-	 *
-	 * @param sourceFilter
-	 */
-	void addSourceFilter(SourceFilter sourceFilter);
-
-	/**
-	 * Get SourceFilter to be returned to get include and exclude source
-	 * fields as part of search request.
-	 *
-	 * @return SourceFilter
-	 */
-	SourceFilter getSourceFilter();
-
 	/**
 	 * Get minimum score
 	 *
@@ -143,7 +135,6 @@ public interface Query {
 
 	/**
 	 * Type of search
-	 *
 	 * @return
 	 */
 	SearchType getSearchType();

src/main/java/org/springframework/data/elasticsearch/core/query/ScriptField.java

@@ -1,26 +0,0 @@
-package org.springframework.data.elasticsearch.core.query;
-
-import org.elasticsearch.script.Script;
-
-/**
- * @author Ryan Murfitt
- * @author Artur Konczak
- */
-public class ScriptField {
-
-	private final String fieldName;
-	private final Script script;
-
-	public ScriptField(String fieldName, Script script) {
-		this.fieldName = fieldName;
-		this.script = script;
-	}
-
-	public String fieldName() {
-		return fieldName;
-	}
-
-	public Script script() {
-		return script;
-	}
-}

src/main/java/org/springframework/data/elasticsearch/core/query/SearchQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013 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,9 +17,9 @@ package org.springframework.data.elasticsearch.core.query;
 
 import java.util.List;
 
+import org.elasticsearch.index.query.FilterBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
+import org.elasticsearch.search.highlight.HighlightBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
 import org.springframework.data.elasticsearch.core.facet.FacetRequest;
 
@@ -34,19 +34,11 @@ public interface SearchQuery extends Query {
 
 	QueryBuilder getQuery();
 
-	QueryBuilder getFilter();
+	FilterBuilder getFilter();
 
 	List<SortBuilder> getElasticsearchSorts();
 
-	@Deprecated
 	List<FacetRequest> getFacets();
 
-	List<AbstractAggregationBuilder> getAggregations();
-
 	HighlightBuilder.Field[] getHighlightFields();
-
-	List<IndexBoost> getIndicesBoost();
-
-    List<ScriptField> getScriptFields();
-
 }

src/main/java/org/springframework/data/elasticsearch/core/query/SourceFilter.java

@@ -1,28 +0,0 @@
-/*
- * Copyright 2016 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
- *
- *      http://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.query;
-
-/**
- * SourceFilter for providing includes and excludes.
- *
- * @Author Jon Tsiros
- */
-public interface SourceFilter {
-
-	String[] getIncludes();
-
-	String[] getExcludes();
-}

src/main/java/org/springframework/data/elasticsearch/core/query/UpdateQuery.java

@@ -16,7 +16,6 @@
 package org.springframework.data.elasticsearch.core.query;
 
 import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.update.UpdateRequest;
 
 /**
  * @author Rizwan Idrees
@@ -25,7 +24,7 @@ import org.elasticsearch.action.update.UpdateRequest;
 public class UpdateQuery {
 
 	private String id;
-	private UpdateRequest updateRequest;
+	private IndexRequest indexRequest;
 	private String indexName;
 	private String type;
 	private Class clazz;
@@ -39,12 +38,12 @@ public class UpdateQuery {
 		this.id = id;
 	}
 
-	public UpdateRequest getUpdateRequest() {
-		return updateRequest;
+	public IndexRequest getIndexRequest() {
+		return indexRequest;
 	}
 
-	public void setUpdateRequest(UpdateRequest updateRequest) {
-		this.updateRequest = updateRequest;
+	public void setIndexRequest(IndexRequest indexRequest) {
+		this.indexRequest = indexRequest;
 	}
 
 	public String getIndexName() {

src/main/java/org/springframework/data/elasticsearch/core/query/UpdateQueryBuilder.java

@@ -16,7 +16,6 @@
 package org.springframework.data.elasticsearch.core.query;
 
 import org.elasticsearch.action.index.IndexRequest;
-import org.elasticsearch.action.update.UpdateRequest;
 
 /**
  * @author Rizwan Idrees
@@ -25,7 +24,6 @@ import org.elasticsearch.action.update.UpdateRequest;
 public class UpdateQueryBuilder {
 
 	private String id;
-	private UpdateRequest updateRequest;
 	private IndexRequest indexRequest;
 	private String indexName;
 	private String type;
@@ -37,11 +35,6 @@ public class UpdateQueryBuilder {
 		return this;
 	}
 
-	public UpdateQueryBuilder withUpdateRequest(UpdateRequest updateRequest) {
-		this.updateRequest = updateRequest;
-		return this;
-	}
-
 	public UpdateQueryBuilder withIndexRequest(IndexRequest indexRequest) {
 		this.indexRequest = indexRequest;
 		return this;
@@ -73,13 +66,7 @@ public class UpdateQueryBuilder {
 		updateQuery.setIndexName(indexName);
 		updateQuery.setType(type);
 		updateQuery.setClazz(clazz);
-		if (this.indexRequest != null) {
-			if (this.updateRequest == null) {
-				updateRequest = new UpdateRequest();
-			}
-			updateRequest.doc(indexRequest);
-		}
-		updateQuery.setUpdateRequest(updateRequest);
+		updateQuery.setIndexRequest(indexRequest);
 		updateQuery.setDoUpsert(doUpsert);
 		return updateQuery;
 	}

src/main/java/org/springframework/data/elasticsearch/repository/ElasticsearchRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013 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,6 +20,7 @@ import java.io.Serializable;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.core.FacetedPage;
 import org.springframework.data.elasticsearch.core.query.SearchQuery;
 import org.springframework.data.repository.NoRepositoryBean;
 
@@ -36,13 +37,9 @@ public interface ElasticsearchRepository<T, ID extends Serializable> extends Ela
 
 	Iterable<T> search(QueryBuilder query);
 
-	Page<T> search(QueryBuilder query, Pageable pageable);
+	FacetedPage<T> search(QueryBuilder query, Pageable pageable);
 
-	Page<T> search(SearchQuery searchQuery);
+	FacetedPage<T> search(SearchQuery searchQuery);
 
 	Page<T> searchSimilar(T entity, String[] fields, Pageable pageable);
-
-	void refresh();
-
-	Class<T> getEntityClass();
 }

src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013 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,71 +15,42 @@
  */
 package org.springframework.data.elasticsearch.repository.cdi;
 
-import java.lang.annotation.Annotation;
-import java.util.Optional;
-import java.util.Set;
-
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
+import java.lang.annotation.Annotation;
+import java.util.Set;
 
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.repository.support.ElasticsearchRepositoryFactory;
 import org.springframework.data.repository.cdi.CdiRepositoryBean;
-import org.springframework.data.repository.config.CustomRepositoryImplementationDetector;
 import org.springframework.util.Assert;
 
 /**
- * Uses {@link CdiRepositoryBean} to create
- * {@link org.springframework.data.elasticsearch.repository.ElasticsearchRepository} instances.
+ * Uses CdiRepositoryBean to create ElasticsearchRepository instances.
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Mark Paluch
  */
 public class ElasticsearchRepositoryBean<T> extends CdiRepositoryBean<T> {
 
 	private final Bean<ElasticsearchOperations> elasticsearchOperationsBean;
 
-	/**
-	 * Creates a new {@link ElasticsearchRepositoryBean}.
-	 *
-	 * @param operations must not be {@literal null}.
-	 * @param qualifiers must not be {@literal null}.
-	 * @param repositoryType must not be {@literal null}.
-	 * @param beanManager must not be {@literal null}.
-	 * @param detector detector for the custom {@link org.springframework.data.repository.Repository} implementations
-	 *          {@link CustomRepositoryImplementationDetector}, can be {@literal null}.
-	 */
 	public ElasticsearchRepositoryBean(Bean<ElasticsearchOperations> operations, Set<Annotation> qualifiers,
-			Class<T> repositoryType, BeanManager beanManager, CustomRepositoryImplementationDetector detector) {
-
-		super(qualifiers, repositoryType, beanManager, Optional.of(detector));
+									   Class<T> repositoryType, BeanManager beanManager) {
+		super(qualifiers, repositoryType, beanManager);
 
 		Assert.notNull(operations, "Cannot create repository with 'null' for ElasticsearchOperations.");
 		this.elasticsearchOperationsBean = operations;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(javax.enterprise.context.spi.CreationalContext, java.lang.Class, java.util.Optional)
-	 */
 	@Override
-	protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType,
-			Optional<Object> customImplementation) {
-
+	protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType) {
 		ElasticsearchOperations elasticsearchOperations = getDependencyInstance(elasticsearchOperationsBean,
 				ElasticsearchOperations.class);
-
-		ElasticsearchRepositoryFactory factory = new ElasticsearchRepositoryFactory(elasticsearchOperations);
-
-		return customImplementation //
-				.map(o -> factory.getRepository(repositoryType, o)) //
-				.orElseGet(() -> factory.getRepository(repositoryType));
+		return new ElasticsearchRepositoryFactory(elasticsearchOperations).getRepository(repositoryType);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.cdi.CdiRepositoryBean#getScope()
-	 */
 	@Override
 	public Class<? extends Annotation> getScope() {
 		return elasticsearchOperationsBean.getScope();

src/main/java/org/springframework/data/elasticsearch/repository/cdi/ElasticsearchRepositoryExtension.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013-2014 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,6 +15,12 @@
  */
 package org.springframework.data.elasticsearch.repository.cdi;
 
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.UnsatisfiedResolutionException;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.ProcessBean;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.HashMap;
@@ -22,35 +28,27 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.UnsatisfiedResolutionException;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.ProcessBean;
-
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.repository.cdi.CdiRepositoryBean;
 import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport;
 
 /**
- * CDI extension to export Elasticsearch repositories.
+ * ElasticsearchRepositoryExtension
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Oliver Gierke
- * @author Mark Paluch
  */
 public class ElasticsearchRepositoryExtension extends CdiRepositoryExtensionSupport {
 
-	private final Map<Set<Annotation>, Bean<ElasticsearchOperations>> elasticsearchOperationsMap = new HashMap<>();
+	private final Map<String, Bean<ElasticsearchOperations>> elasticsearchOperationsMap = new HashMap<String, Bean<ElasticsearchOperations>>();
 
 	@SuppressWarnings("unchecked")
 	<T> void processBean(@Observes ProcessBean<T> processBean) {
 		Bean<T> bean = processBean.getBean();
 		for (Type type : bean.getTypes()) {
 			if (type instanceof Class<?> && ElasticsearchOperations.class.isAssignableFrom((Class<?>) type)) {
-				elasticsearchOperationsMap.put(bean.getQualifiers(), ((Bean<ElasticsearchOperations>) bean));
+				elasticsearchOperationsMap.put(bean.getQualifiers().toString(), ((Bean<ElasticsearchOperations>) bean));
 			}
 		}
 	}
@@ -67,17 +65,16 @@ public class ElasticsearchRepositoryExtension extends CdiRepositoryExtensionSupp
 		}
 	}
 
-	private <T> CdiRepositoryBean<T> createRepositoryBean(Class<T> repositoryType, Set<Annotation> qualifiers,
-			BeanManager beanManager) {
+	private <T> CdiRepositoryBean<T> createRepositoryBean(Class<T> repositoryType, Set<Annotation> qualifiers, BeanManager beanManager) {
 
-		if (!this.elasticsearchOperationsMap.containsKey(qualifiers)) {
+		Bean<ElasticsearchOperations> elasticsearchOperationsBean = this.elasticsearchOperationsMap.get(qualifiers
+				.toString());
+
+		if (elasticsearchOperationsBean == null) {
 			throw new UnsatisfiedResolutionException(String.format("Unable to resolve a bean for '%s' with qualifiers %s.",
 					ElasticsearchOperations.class.getName(), qualifiers));
 		}
 
-		Bean<ElasticsearchOperations> elasticsearchOperationsBean = this.elasticsearchOperationsMap.get(qualifiers);
-
-		return new ElasticsearchRepositoryBean<>(elasticsearchOperationsBean, qualifiers, repositoryType, beanManager,
-				getCustomImplementationDetector());
+		return new ElasticsearchRepositoryBean<T>(elasticsearchOperationsBean, qualifiers, repositoryType, beanManager);
 	}
 }

src/main/java/org/springframework/data/elasticsearch/repository/config/ElasticsearchRepositoryConfigExtension.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013 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,16 +15,8 @@
  */
 package org.springframework.data.elasticsearch.repository.config;
 
-import java.lang.annotation.Annotation;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.repository.ElasticsearchCrudRepository;
-import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 import org.springframework.data.elasticsearch.repository.support.ElasticsearchRepositoryFactoryBean;
 import org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource;
 import org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport;
@@ -38,16 +30,15 @@ import org.w3c.dom.Element;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Mark Paluch
  */
 public class ElasticsearchRepositoryConfigExtension extends RepositoryConfigurationExtensionSupport {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getRepositoryFactoryBeanClassName()
+	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getRepositoryFactoryClassName()
 	 */
 	@Override
-	public String getRepositoryFactoryBeanClassName() {
+	public String getRepositoryFactoryClassName() {
 		return ElasticsearchRepositoryFactoryBean.class.getName();
 	}
 
@@ -60,7 +51,7 @@ public class ElasticsearchRepositoryConfigExtension extends RepositoryConfigurat
 		return "elasticsearch";
 	}
 
-	/*
+	/* 
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource)
 	 */
@@ -71,7 +62,7 @@ public class ElasticsearchRepositoryConfigExtension extends RepositoryConfigurat
 		builder.addPropertyReference("elasticsearchOperations", attributes.getString("elasticsearchTemplateRef"));
 	}
 
-	/*
+	/* 
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.XmlRepositoryConfigurationSource)
 	 */
@@ -81,22 +72,4 @@ public class ElasticsearchRepositoryConfigExtension extends RepositoryConfigurat
 		Element element = config.getElement();
 		builder.addPropertyReference("elasticsearchOperations", element.getAttribute("elasticsearch-template-ref"));
 	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getIdentifyingAnnotations()
-	 */
-	@Override
-	protected Collection<Class<? extends Annotation>> getIdentifyingAnnotations() {
-		return Collections.<Class<? extends Annotation>> singleton(Document.class);
-	}
-
-	/*
-	* (non-Javadoc)
-	* @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#getIdentifyingTypes()
-	*/
-	@Override
-	protected Collection<Class<?>> getIdentifyingTypes() {
-		return Arrays.<Class<?>> asList(ElasticsearchRepository.class, ElasticsearchCrudRepository.class);
-	}
 }

src/main/java/org/springframework/data/elasticsearch/repository/config/EnableElasticsearchRepositories.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * Copyright 2013 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,7 +21,6 @@ import org.springframework.context.annotation.ComponentScan.Filter;
 import org.springframework.context.annotation.Import;
 import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
 import org.springframework.data.elasticsearch.repository.support.ElasticsearchRepositoryFactoryBean;
-import org.springframework.data.repository.config.DefaultRepositoryBaseClass;
 import org.springframework.data.repository.query.QueryLookupStrategy.Key;
 
 /**
@@ -30,7 +29,6 @@ import org.springframework.data.repository.query.QueryLookupStrategy.Key;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Kevin Leturc
  */
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
@@ -48,7 +46,7 @@ public @interface EnableElasticsearchRepositories {
 
 	/**
 	 * Base packages to scan for annotated components. {@link #value()} is an alias for (and mutually exclusive with) this
-	 * attribute. Use {@link #basePackageClasses()} for a type-safe alternative to text-based package names.
+	 * attribute. Use {@link #basePackageClasses()} for a type-safe alternative to String-based package names.
 	 */
 	String[] basePackages() default {};
 
@@ -104,13 +102,6 @@ public @interface EnableElasticsearchRepositories {
 	 */
 	Class<?> repositoryFactoryBeanClass() default ElasticsearchRepositoryFactoryBean.class;
 
-	/**
-	 * Configure the repository base class to be used to create repository proxies for this particular configuration.
-	 *
-	 * @return
-	 */
-	Class<?> repositoryBaseClass() default DefaultRepositoryBaseClass.class;
-
 	// Elasticsearch specific configuration
 
 	/**
@@ -120,10 +111,4 @@ public @interface EnableElasticsearchRepositories {
 	 * @return
 	 */
 	String elasticsearchTemplateRef() default "elasticsearchTemplate";
-
-	/**
-	 * Configures whether nested repository-interfaces (e.g. defined as inner classes) should be discovered by the
-	 * repositories infrastructure.
-	 */
-	boolean considerNestedRepositories() default false;
 }

src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchPartQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013 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.repository.query;
 
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
 import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
@@ -24,17 +22,12 @@ import org.springframework.data.elasticsearch.repository.query.parser.Elasticsea
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.repository.query.ParametersParameterAccessor;
 import org.springframework.data.repository.query.parser.PartTree;
-import org.springframework.util.ClassUtils;
-import org.springframework.data.util.CloseableIterator;
-import org.springframework.data.util.StreamUtils;
 
 /**
  * ElasticsearchPartQuery
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Kevin Leturc
- * @author Mark Paluch
  */
 public class ElasticsearchPartQuery extends AbstractElasticsearchRepositoryQuery {
 
@@ -51,54 +44,16 @@ public class ElasticsearchPartQuery extends AbstractElasticsearchRepositoryQuery
 	public Object execute(Object[] parameters) {
 		ParametersParameterAccessor accessor = new ParametersParameterAccessor(queryMethod.getParameters(), parameters);
 		CriteriaQuery query = createQuery(accessor);
-		if(tree.isDelete()) {
-			Object result = countOrGetDocumentsForDelete(query, accessor);
-			elasticsearchOperations.delete(query, queryMethod.getEntityInformation().getJavaType());
-			return result;
-		} else if (queryMethod.isPageQuery()) {
+		if (queryMethod.isPageQuery()) {
 			query.setPageable(accessor.getPageable());
 			return elasticsearchOperations.queryForPage(query, queryMethod.getEntityInformation().getJavaType());
-		} else if (queryMethod.isStreamQuery()) {
-			Class<?> entityType = queryMethod.getEntityInformation().getJavaType();
-			if (query.getPageable().isUnpaged()) {
-				int itemCount = (int) elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType());
-				query.setPageable(PageRequest.of(0, Math.max(1, itemCount)));
-			}
-
-			return StreamUtils.createStreamFromIterator((CloseableIterator<Object>) elasticsearchOperations.stream(query, entityType));
-
 		} else if (queryMethod.isCollectionQuery()) {
-			if (accessor.getPageable() == null) {
-				int itemCount = (int) elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType());
-				query.setPageable(PageRequest.of(0, Math.max(1, itemCount)));
-			} else {
-			    query.setPageable(accessor.getPageable());
-		    }
-			return elasticsearchOperations.queryForList(query, queryMethod.getEntityInformation().getJavaType());
-		} else if (tree.isCountProjection()) {
-			return elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType());
-		}
-		return elasticsearchOperations.queryForObject(query, queryMethod.getEntityInformation().getJavaType());
-	}
-
-	private Object countOrGetDocumentsForDelete(CriteriaQuery query, ParametersParameterAccessor accessor) {
-
-		Object result = null;
-
-		if (queryMethod.isCollectionQuery()) {
-			if (accessor.getPageable().isUnpaged()) {
-				int itemCount = (int) elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType());
-				query.setPageable(PageRequest.of(0, Math.max(1, itemCount)));
-			} else {
+			if (accessor.getPageable() != null) {
 				query.setPageable(accessor.getPageable());
 			}
-			result = elasticsearchOperations.queryForList(query, queryMethod.getEntityInformation().getJavaType());
+			return elasticsearchOperations.queryForList(query, queryMethod.getEntityInformation().getJavaType());
 		}
-
-		if (ClassUtils.isAssignable(Number.class, queryMethod.getReturnedObjectType())) {
-			result = elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType());
-		}
-		return result;
+		return elasticsearchOperations.queryForObject(query, queryMethod.getEntityInformation().getJavaType());
 	}
 
 	public CriteriaQuery createQuery(ParametersParameterAccessor accessor) {

src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchQueryMethod.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013 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,32 +19,41 @@ import java.lang.reflect.Method;
 
 import org.springframework.core.annotation.AnnotationUtils;
 import org.springframework.data.elasticsearch.annotations.Query;
-import org.springframework.data.projection.ProjectionFactory;
+import org.springframework.data.elasticsearch.repository.support.ElasticsearchEntityInformation;
+import org.springframework.data.elasticsearch.repository.support.ElasticsearchEntityInformationCreator;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.query.QueryMethod;
+import org.springframework.util.StringUtils;
 
 /**
  * ElasticsearchQueryMethod
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Oliver Gierke
- * @author Mark Paluch
  */
 public class ElasticsearchQueryMethod extends QueryMethod {
 
-	private final Query queryAnnotation;
+	private final ElasticsearchEntityInformation<?, ?> entityInformation;
+	private Method method;
 
-	public ElasticsearchQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFactory factory) {
-		super(method, metadata, factory);
-		this.queryAnnotation = method.getAnnotation(Query.class);
+	public ElasticsearchQueryMethod(Method method, RepositoryMetadata metadata,
+									ElasticsearchEntityInformationCreator elasticsearchEntityInformationCreator) {
+		super(method, metadata);
+		this.entityInformation = elasticsearchEntityInformationCreator.getEntityInformation(metadata
+				.getReturnedDomainClass(method));
+		this.method = method;
 	}
 
 	public boolean hasAnnotatedQuery() {
-		return this.queryAnnotation != null;
+		return getQueryAnnotation() != null;
 	}
 
 	public String getAnnotatedQuery() {
-		return (String) AnnotationUtils.getValue(queryAnnotation, "value");
+		String query = (String) AnnotationUtils.getValue(getQueryAnnotation(), "value");
+		return StringUtils.hasText(query) ? query : null;
+	}
+
+	private Query getQueryAnnotation() {
+		return this.method.getAnnotation(Query.class);
 	}
 }

src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchStringQuery.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 the original author or authors.
+ * Copyright 2013 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,7 +19,6 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.convert.DateTimeConverters;
 import org.springframework.data.elasticsearch.core.query.StringQuery;
@@ -31,7 +30,6 @@ import org.springframework.util.Assert;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Mark Paluch
  */
 public class ElasticsearchStringQuery extends AbstractElasticsearchRepositoryQuery {
 
@@ -52,8 +50,8 @@ public class ElasticsearchStringQuery extends AbstractElasticsearchRepositoryQue
 		}
 	}
 
-	public ElasticsearchStringQuery(ElasticsearchQueryMethod queryMethod, ElasticsearchOperations elasticsearchOperations,
-			String query) {
+	public ElasticsearchStringQuery(ElasticsearchQueryMethod queryMethod,
+									ElasticsearchOperations elasticsearchOperations, String query) {
 		super(queryMethod, elasticsearchOperations);
 		Assert.notNull(query, "Query cannot be empty");
 		this.query = query;
@@ -67,7 +65,7 @@ public class ElasticsearchStringQuery extends AbstractElasticsearchRepositoryQue
 			stringQuery.setPageable(accessor.getPageable());
 			return elasticsearchOperations.queryForPage(stringQuery, queryMethod.getEntityInformation().getJavaType());
 		} else if (queryMethod.isCollectionQuery()) {
-			if (accessor.getPageable().isPaged()) {
+			if (accessor.getPageable() != null) {
 				stringQuery.setPageable(accessor.getPageable());
 			}
 			return elasticsearchOperations.queryForList(stringQuery, queryMethod.getEntityInformation().getJavaType());

src/main/java/org/springframework/data/elasticsearch/repository/query/parser/ElasticsearchQueryCreator.java

@@ -20,14 +20,9 @@ import java.util.Iterator;
 
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.domain.Sort;
-import org.springframework.data.elasticsearch.core.geo.GeoBox;
-import org.springframework.data.elasticsearch.core.geo.GeoPoint;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
 import org.springframework.data.elasticsearch.core.query.Criteria;
 import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
-import org.springframework.data.geo.Box;
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.Point;
 import org.springframework.data.mapping.context.MappingContext;
 import org.springframework.data.mapping.context.PersistentPropertyPath;
 import org.springframework.data.repository.query.ParameterAccessor;
@@ -40,8 +35,6 @@ import org.springframework.data.repository.query.parser.PartTree;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Franck Marchand
- * @author Artur Konczak
  */
 public class ElasticsearchQueryCreator extends AbstractQueryCreator<CriteriaQuery, CriteriaQuery> {
 
@@ -62,7 +55,7 @@ public class ElasticsearchQueryCreator extends AbstractQueryCreator<CriteriaQuer
 	protected CriteriaQuery create(Part part, Iterator<Object> iterator) {
 		PersistentPropertyPath<ElasticsearchPersistentProperty> path = context
 				.getPersistentPropertyPath(part.getProperty());
-		return new CriteriaQuery(from(part,
+		return new CriteriaQuery(from(part.getType(),
 				new Criteria(path.toDotPath(ElasticsearchPersistentProperty.PropertyToFieldNameConverter.INSTANCE)), iterator));
 	}
 
@@ -73,7 +66,7 @@ public class ElasticsearchQueryCreator extends AbstractQueryCreator<CriteriaQuer
 		}
 		PersistentPropertyPath<ElasticsearchPersistentProperty> path = context
 				.getPersistentPropertyPath(part.getProperty());
-		return base.addCriteria(from(part,
+		return base.addCriteria(from(part.getType(),
 				new Criteria(path.toDotPath(ElasticsearchPersistentProperty.PropertyToFieldNameConverter.INSTANCE)), iterator));
 	}
 
@@ -90,9 +83,7 @@ public class ElasticsearchQueryCreator extends AbstractQueryCreator<CriteriaQuer
 		return query.addSort(sort);
 	}
 
-	private Criteria from(Part part, Criteria instance, Iterator<?> parameters) {
-		Part.Type type = part.getType();
-
+	private Criteria from(Part.Type type, Criteria instance, Iterator<?> parameters) {
 		Criteria criteria = instance;
 		if (criteria == null) {
 			criteria = new Criteria();
@@ -102,6 +93,8 @@ public class ElasticsearchQueryCreator extends AbstractQueryCreator<CriteriaQuer
 				return criteria.is(true);
 			case FALSE:
 				return criteria.is(false);
+			case SIMPLE_PROPERTY:
+				return criteria.is(parameters.next());
 			case NEGATING_SIMPLE_PROPERTY:
 				return criteria.is(parameters.next()).not();
 			case REGEX:
@@ -113,14 +106,12 @@ public class ElasticsearchQueryCreator extends AbstractQueryCreator<CriteriaQuer
 				return criteria.endsWith(parameters.next().toString());
 			case CONTAINING:
 				return criteria.contains(parameters.next().toString());
-			case GREATER_THAN:
-				return criteria.greaterThan(parameters.next());
 			case AFTER:
+			case GREATER_THAN:
 			case GREATER_THAN_EQUAL:
 				return criteria.greaterThanEqual(parameters.next());
-			case LESS_THAN:
-				return criteria.lessThan(parameters.next());
 			case BEFORE:
+			case LESS_THAN:
 			case LESS_THAN_EQUAL:
 				return criteria.lessThanEqual(parameters.next());
 			case BETWEEN:
@@ -128,57 +119,7 @@ public class ElasticsearchQueryCreator extends AbstractQueryCreator<CriteriaQuer
 			case IN:
 				return criteria.in(asArray(parameters.next()));
 			case NOT_IN:
-				return criteria.notIn(asArray(parameters.next()));
-			case SIMPLE_PROPERTY:
-			case WITHIN: {
-				Object firstParameter = parameters.next();
-				Object secondParameter = null;
-				if (type == Part.Type.SIMPLE_PROPERTY) {
-					if (part.getProperty().getType() != GeoPoint.class)
-						return criteria.is(firstParameter);
-					else {
-						// it means it's a simple find with exact geopoint matching (e.g. findByLocation)
-						// and because Elasticsearch does not have any kind of query with just a geopoint
-						// as argument we use a "geo distance" query with a distance of one meter.
-						secondParameter = ".001km";
-					}
-				} else {
-					secondParameter = parameters.next();
-				}
-
-				if (firstParameter instanceof GeoPoint && secondParameter instanceof String)
-					return criteria.within((GeoPoint) firstParameter, (String) secondParameter);
-
-				if (firstParameter instanceof Point && secondParameter instanceof Distance)
-					return criteria.within((Point) firstParameter, (Distance) secondParameter);
-
-				if (firstParameter instanceof String && secondParameter instanceof String)
-					return criteria.within((String) firstParameter, (String) secondParameter);
-			}
-			case NEAR: {
-				Object firstParameter = parameters.next();
-
-				if (firstParameter instanceof GeoBox) {
-					return criteria.boundedBy((GeoBox) firstParameter);
-				}
-
-				if (firstParameter instanceof Box) {
-					return criteria.boundedBy(GeoBox.fromBox((Box) firstParameter));
-				}
-
-				Object secondParameter = parameters.next();
-
-				// "near" query can be the same query as the "within" query
-				if (firstParameter instanceof GeoPoint && secondParameter instanceof String)
-					return criteria.within((GeoPoint) firstParameter, (String) secondParameter);
-
-				if (firstParameter instanceof Point && secondParameter instanceof Distance)
-					return criteria.within((Point) firstParameter, (Distance) secondParameter);
-
-				if (firstParameter instanceof String && secondParameter instanceof String)
-					return criteria.within((String) firstParameter, (String) secondParameter);
-			}
-
+				return criteria.in(asArray(parameters.next())).not();
 			default:
 				throw new InvalidDataAccessApiUsageException("Illegal criteria found '" + type + "'.");
 		}