DATAES-202 - After release cleanups.

DATAES-202 - Prepare next development iteration.
DATAES-202 - Release version 1.1.4.RELEASE (Evans SR4).
2026-05-24 05:03:17 +00:00 · 2015-10-14 14:17:07 +02:00 · 2015-10-14 03:29:32 -07:00 · 2015-10-14 03:29:30 -07:00 · 2015-10-14 11:25:07 +02:00 · 2015-10-14 11:25:03 +02:00
264 changed files with 3236 additions and 6241 deletions
@@ -1,9 +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).
- [ ] You provide your full name and an email address registered with your GitHub account. If you’re a first-time submitter, make sure you have completed the [Contributor’s License Agreement form](https://support.springsource.com/spring_committer_signup).
@@ -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/].
@@ -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].
@@ -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)
 * [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>1.3.4.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>2.0.0.BUILD-SNAPSHOT</version>
+  <version>1.0.0.BUILD-SNAPSHOT</version>
 </dependency>

 <repository>
@@ -52,21 +52,10 @@ the appropriate dependency version.
 </repository>
 ```

-### Note:
-
-1) Spring data elaticsearch until 1.0.0.RELEASE version is on elasticsearch 1.1.x library, which uses java 1.6 or later version.
-
-2) From spring data elasticsearch 1.1.0.RELEASE the version of elasticsearch is 1.3.x  which is supporting java 1.7 or later.
-
-|   spring data elasticsearch         | elasticsearch |
-|:-----------------------------------:|:-------------:|
-|           2.0.0.RC1                 |      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    |
-
+###Note:
+Spring data elaticsearch 1.0.0.RELEASE version is on elasticsearch 1.1.1 library which uses java 1.6 or later version.
+As latest version of elasticsearch 1.2.x is now supporting java 1.7, future releases of spring data elasticsearch library can be used with Java 7 or later version.
+In order to use with java 6 it has to be with elasticsearch 1.1.x.

 ### 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.
@@ -255,4 +244,4 @@ Before we accept a non-trivial patch or pull request we will need you to sign th

 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)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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>

    <groupId>org.springframework.data</groupId>
    <artifactId>spring-data-elasticsearch</artifactId>
-    <version>2.0.12.BUILD-SNAPSHOT</version>
+    <version>1.1.5.BUILD-SNAPSHOT</version>

    <parent>
        <groupId>org.springframework.data.build</groupId>
        <artifactId>spring-data-parent</artifactId>
-        <version>1.8.12.BUILD-SNAPSHOT</version>
+        <version>1.5.5.BUILD-SNAPSHOT</version>
        <relativePath>../spring-data-build/parent/pom.xml</relativePath>
    </parent>

@@ -23,8 +23,8 @@

        <commonscollections>3.2.1</commonscollections>
        <commonslang>2.6</commonslang>
-        <elasticsearch>2.2.0</elasticsearch>
-        <springdata.commons>1.12.12.BUILD-SNAPSHOT</springdata.commons>
+        <elasticsearch>1.3.2</elasticsearch>
+        <springdata.commons>1.9.5.BUILD-SNAPSHOT</springdata.commons>

    </properties>

@@ -60,6 +60,11 @@
            <artifactId>commons-lang</artifactId>
            <version>${commonslang}</version>
        </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>${commonscollections}</version>
+        </dependency>

        <!-- JODA Time -->
        <dependency>
@@ -108,16 +113,6 @@
            <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>
@@ -126,13 +121,6 @@
            <scope>test</scope>
        </dependency>

-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok}</version>
-            <scope>test</scope>
-        </dependency>
-
    </dependencies>

    <build>
@@ -145,49 +133,13 @@
                <groupId>org.codehaus.mojo</groupId>
                <artifactId>wagon-maven-plugin</artifactId>
            </plugin>
-            <plugin>
-                <groupId>org.asciidoctor</groupId>
-                <artifactId>asciidoctor-maven-plugin</artifactId>
-            </plugin>
+			<plugin>
+				<groupId>org.asciidoctor</groupId>
+				<artifactId>asciidoctor-maven-plugin</artifactId>
+			</plugin>
        </plugins>
-
-        <testResources>
-            <testResource>
-                <directory>${basedir}/src/test/resources</directory>
-            </testResource>
-            <testResource>
-                <targetPath>${basedir}/target/test-home-dir</targetPath>
-                <directory>${basedir}/src/test/es-modules/${elasticsearch}</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </testResource>
-        </testResources>
    </build>

-    <profiles>
-
-        <profile>
-            <id>es2.3.3</id>
-            <properties>
-                <elasticsearch>2.3.3</elasticsearch>
-            </properties>
-        </profile>
-
-        <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>
-
    <developers>
        <developer>
            <id>biomedcentral</id>
@@ -206,7 +158,7 @@
    <pluginRepositories>
        <pluginRepository>
            <id>spring-plugins-release</id>
-            <url>https://repo.spring.io/plugins-release</url>
+            <url>http://repo.spring.io/plugins-release</url>
        </pluginRepository>
    </pluginRepositories>

@@ -219,7 +171,7 @@

    <ciManagement>
        <system>Bamboo</system>
-        <url>https://build.springsource.org/browse/SPRINGDATAES</url>
+        <url>http://build.springsource.org/browse/SPRINGDATAES</url>
    </ciManagement>

    <issueManagement>
@@ -4,9 +4,9 @@ BioMed Central Development Team
 :revdate: {localdate}
 :toc:
 :toc-placement!:
-:spring-data-commons-docs: ../../../../spring-data-commons/src/main/asciidoc
+:spring-data-commons-docs: https://raw.githubusercontent.com/spring-projects/spring-data-commons/master/src/main/asciidoc

-(C) 2013-2015 The original author(s).
+(C) 2013-2014 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.

@@ -32,5 +32,4 @@ include::reference/elasticsearch-misc.adoc[]
 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
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -1,42 +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
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.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 payloads() default false;
-
-	boolean preserveSeparators() default true;
-
-	boolean preservePositionIncrements() default true;
-
-	int maxInputLength() default 50;
-}
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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;
 }
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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,12 +23,10 @@ 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;
@@ -48,9 +41,7 @@ public @interface Field {

 	String searchAnalyzer() default "";

-	String analyzer() default "";
+	String indexAnalyzer() default "";

 	String[] ignoreFields() default {};
-
-	boolean includeInParent() default false;
 }
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
 }
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -21,5 +21,5 @@ package org.springframework.data.elasticsearch.annotations;
 * @author Artur Konczak
 */
 public enum FieldType {
-	String, Integer, Long, Date, Float, Double, Boolean, Object, Auto, Nested, Ip, Attachment
+	String, Integer, Long, Date, Float, Double, Boolean, Object, Auto, Nested, Ip
 }
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -25,8 +25,4 @@ import java.lang.annotation.*;
@Documented
 public @interface GeoPointField {

-        boolean geoHashPrefix() default false;
-
-        String geoHashPrecision() default "0";
-
 }
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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 "";
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -30,5 +30,5 @@ public @interface MultiField {

 	public Field mainField();

-	public InnerField[] otherFields() default {};
+	public NestedField[] otherFields() default {};
 }
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -25,9 +25,9 @@ import java.lang.annotation.Target;
 */
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.FIELD)
-public @interface InnerField {
+public @interface NestedField {

-	String suffix();
+	String dotSuffix();

 	FieldType type();

@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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 "";
-
-}
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -17,11 +17,9 @@ package org.springframework.data.elasticsearch.client;

 import static org.elasticsearch.node.NodeBuilder.*;

-import java.io.InputStream;
-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.common.settings.ImmutableSettings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
@@ -42,9 +40,6 @@ public class NodeClientFactoryBean implements FactoryBean<NodeClient>, Initializ
 	private boolean enableHttp;
 	private String clusterName;
 	private NodeClient nodeClient;
-	private String pathData;
-	private String pathHome;
-	private String pathConfiguration;

 	NodeClientFactoryBean() {
 	}
@@ -70,23 +65,11 @@ public class NodeClientFactoryBean implements FactoryBean<NodeClient>, Initializ

 	@Override
 	public void afterPropertiesSet() throws Exception {
-		nodeClient = (NodeClient) nodeBuilder().settings(Settings.builder().put(loadConfig())
-				.put("http.enabled", String.valueOf(this.enableHttp))
-				.put("path.home", this.pathHome)
-				.put("path.data", this.pathData))
-				.clusterName(this.clusterName).local(this.local).node()
-				.client();
-	}
+		ImmutableSettings.Builder settings = ImmutableSettings.settingsBuilder().put("http.enabled",
+				String.valueOf(this.enableHttp));

-	private Settings loadConfig() {
-		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();
+		nodeClient = (NodeClient) nodeBuilder().settings(settings).clusterName(this.clusterName).local(this.local).node()
+				.client();
 	}

 	public void setLocal(boolean local) {
@@ -101,18 +84,6 @@ public class NodeClientFactoryBean implements FactoryBean<NodeClient>, Initializ
 		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 {
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -16,8 +16,8 @@
 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;
@@ -86,24 +86,24 @@ public class TransportClientFactoryBean implements FactoryBean<TransportClient>,
 	}

 	protected void buildClient() throws Exception {
-		client = TransportClient.builder().settings(settings()).build();
+		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)
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015 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.
 * You may obtain a copy of the License at
 *
- * https://www.apache.org/licenses/LICENSE-2.0
+ * 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,
@@ -43,9 +43,6 @@ public class NodeClientBeanDefinitionParser extends AbstractBeanDefinitionParser
 		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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -1,11 +1,11 @@
 /*
- * 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.
 * You may obtain a copy of the License at
 *
- * https://www.apache.org/licenses/LICENSE-2.0
+ * 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,
@@ -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,8 +23,9 @@ 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;
@@ -37,30 +39,24 @@ 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>();
-		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 +70,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<QueryBuilder>();
+		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,15 +96,15 @@ 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;
@@ -129,26 +123,25 @@ class CriteriaFilterProcessor {

 				if (valArray[0] instanceof GeoPoint) {
 					GeoPoint loc = (GeoPoint) valArray[0];
-					geoDistanceQueryBuilder.lat(loc.getLat()).lon(loc.getLon()).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
+					((GeoDistanceFilterBuilder) filter).lat(loc.getLat()).lon(loc.getLon()).distance(dist.toString());
 				} else if (valArray[0] instanceof Point) {
 					GeoPoint loc = GeoPoint.fromPoint((Point) valArray[0]);
-					geoDistanceQueryBuilder.lat(loc.getLat()).lon(loc.getLon()).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
+					((GeoDistanceFilterBuilder) filter).lat(loc.getLat()).lon(loc.getLon()).distance(dist.toString());
 				} else {
 					String loc = (String) valArray[0];
 					if (loc.contains(",")) {
 						String c[] = loc.split(",");
-						geoDistanceQueryBuilder.lat(Double.parseDouble(c[0])).lon(Double.parseDouble(c[1])).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
+						((GeoDistanceFilterBuilder) filter).lat(Double.parseDouble(c[0])).lon(Double.parseDouble(c[1])).distance(dist.toString());
 					} else {
-						geoDistanceQueryBuilder.geohash(loc).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
+						((GeoDistanceFilterBuilder) filter).geohash(loc).distance(dist.toString());
 					}
 				}
-				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 +149,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 String
-					twoParameterBBox((GeoBoundingBoxQueryBuilder) filter, valArray);
+					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)).");
@@ -195,7 +188,7 @@ class CriteriaFilterProcessor {
 		}
 	}

-	private void oneParameterBBox(GeoBoundingBoxQueryBuilder filter, Object value) {
+	private void oneParameterBBox(GeoBoundingBoxFilterBuilder 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;
@@ -219,7 +212,7 @@ class CriteriaFilterProcessor {
 		return true;
 	}

-	private void twoParameterBBox(GeoBoundingBoxQueryBuilder filter, Object[] values) {
+	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];
@@ -234,12 +227,12 @@ class CriteriaFilterProcessor {
 		}
 	}

-	private List<QueryBuilder> buildNegationFilter(String fieldName, Iterator<Criteria.CriteriaEntry> it) {
-		List<QueryBuilder> notFilterList = new LinkedList<QueryBuilder>();
+	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);
 		}

@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -27,7 +27,6 @@ import org.apache.lucene.queryparser.flexible.core.util.StringUtils;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.BoostableQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
-import org.elasticsearch.index.query.QueryStringQueryBuilder;
 import org.springframework.data.elasticsearch.core.query.Criteria;
 import org.springframework.util.Assert;

@@ -37,7 +36,6 @@ import org.springframework.util.Assert;
 * @author Rizwan Idrees
 * @author Mohsin Husen
 * @author Franck Marchand
- * @author Artur Konczak
 */
 class CriteriaQueryProcessor {

@@ -51,19 +49,11 @@ class CriteriaQueryProcessor {
 		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()) {
@@ -74,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()) {
@@ -120,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));
 			}
 		}

@@ -134,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(QueryStringQueryBuilder.Operator.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;
 	}

@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
@@ -1,11 +1,11 @@
 /*
- * Copyright 2014-2016 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -18,28 +18,28 @@ 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 com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
+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.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
+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.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;
@@ -47,8 +47,6 @@ import org.springframework.data.mapping.context.MappingContext;

 /**
 * @author Artur Konczak
- * @author Young Gu
- * @author Oliver Gierke
 */
 public class DefaultResultMapper extends AbstractResultMapper {

@@ -67,58 +65,36 @@ public class DefaultResultMapper extends AbstractResultMapper {
 		super(entityMapper);
 	}

-	public DefaultResultMapper(
-			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext,
-			EntityMapper entityMapper) {
-		super(entityMapper);
-		this.mappingContext = mappingContext;
-	}
-
 	@Override
-	public <T> Page<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<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 PageImpl<T>(results, pageable, totalHits);
+		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> 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);
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-
-    private <T> T mapEntity(Collection<SearchHitField> values, Class<T> clazz) {
+	private <T> T mapEntity(Collection<SearchHitField> values, Class<T> clazz) {
 		return mapEntity(buildJSONFromFields(values), clazz);
 	}

@@ -162,7 +138,6 @@ public class DefaultResultMapper extends AbstractResultMapper {
 		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);
 			}
 		}
@@ -170,15 +145,18 @@ 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.getPersistentEntity(clazz);
-			PersistentProperty<?> 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();
+					}
+				}
 			}
 		}
 	}
@@ -1,11 +1,11 @@
 /*
- * 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -15,18 +15,15 @@
 */
 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.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
@@ -42,11 +39,6 @@ public interface ElasticsearchOperations {
 	 */
 	ElasticsearchConverter getElasticsearchConverter();

-	/**
-	 * @return elasticsearch client
-	 */
-	Client getClient();
-
 	/**
 	 * Create an index for a class
 	 *
@@ -179,7 +171,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
@@ -188,7 +180,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}
@@ -206,7 +198,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
@@ -215,47 +207,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}
@@ -371,13 +323,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
 	 *
@@ -388,14 +333,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
 	 *
@@ -437,6 +374,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
 	 *
@@ -467,70 +412,28 @@ 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);
-
-	/**
-	 * Returns scroll id for criteria query
-	 *
-	 * @param query The criteria query.
-	 * @param scrollTimeInMillis The time in millisecond for scroll feature
-	 * {@link org.elasticsearch.action.search.SearchRequestBuilder#setScroll(org.elasticsearch.common.unit.TimeValue)}.
-	 * @param noFields The no fields support
-	 * {@link org.elasticsearch.action.search.SearchRequestBuilder#setNoFields()}.
-	 * @return The scan id for input query.
-	 */
-	String scan(CriteriaQuery query, long scrollTimeInMillis, boolean noFields);
-
-	/**
-	 * Returns scroll id for criteria query
-	 *
-	 * @param query The criteria query.
-	 * @param scrollTimeInMillis The time in millisecond for scroll feature
-	 * {@link org.elasticsearch.action.search.SearchRequestBuilder#setScroll(org.elasticsearch.common.unit.TimeValue)}.
-	 * @param noFields The no fields support
-	 * {@link org.elasticsearch.action.search.SearchRequestBuilder#setNoFields()}.
-	 * @param clazz The class of entity to retrieve.
-	 * @param <T> The type of entity to retrieve.
-	 * @return The scan id for input query.
-	 */
-	<T> String scan(CriteriaQuery query, long scrollTimeInMillis, boolean noFields, Class<T> clazz);
+	<T> void refresh(Class<T> clazz, boolean waitForOperation);

 	/**
 	 * 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 noFields The no fields support
-	 * {@link org.elasticsearch.action.search.SearchRequestBuilder#setNoFields()}.
-	 * @return The scan id for input query.
+	 * @param query
+	 * @param scrollTimeInMillis
+	 * @param noFields
+	 * @return
 	 */
 	String scan(SearchQuery query, long scrollTimeInMillis, boolean noFields);

-	/**
-	 * 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 noFields The no fields support
-	 * {@link org.elasticsearch.action.search.SearchRequestBuilder#setNoFields()}.
-	 * @param clazz The class of entity to retrieve.
-	 * @param <T> The type of entity to retrieve.
-	 * @return The scan id for input query.
-	 */
-	<T> String scan(SearchQuery query, long scrollTimeInMillis, boolean noFields, Class<T> clazz);
-
 	/**
 	 * Scrolls the results for give scroll id
 	 *
@@ -553,14 +456,6 @@ public interface ElasticsearchOperations {
 	 */
 	<T> Page<T> scroll(String scrollId, long scrollTimeInMillis, SearchResultMapper mapper);

-	/**
-	 * Clears the search contexts associated with specified scroll ids.
-	 *
-	 * @param scrollId
-	 *
-	 */
-	<T> void clearScroll(String scrollId);
-
 	/**
 	 * more like this query to search for documents that are "like" a specific document.
 	 *
@@ -593,11 +488,8 @@ public interface ElasticsearchOperations {
 	 * @param indexName
 	 * @return
 	 */
-	List<AliasMetaData> queryForAlias(String indexName);
+	Set<String> queryForAlias(String indexName);


 	<T> T query(SearchQuery query, ResultsExtractor<T> resultsExtractor);
-
-
-	ElasticsearchPersistentEntity getPersistentEntityFor(Class clazz);
 }
@@ -1,11 +1,11 @@
 /*
- * 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -15,25 +15,26 @@
 */
 package org.springframework.data.elasticsearch.core;

-import static org.apache.commons.lang.StringUtils.isNotBlank;
-import static org.apache.commons.lang.StringUtils.isBlank;
+import static org.apache.commons.collections.CollectionUtils.isNotEmpty;
+import static org.apache.commons.lang.StringUtils.*;
 import static org.elasticsearch.action.search.SearchType.*;
 import static org.elasticsearch.client.Requests.*;
 import static org.elasticsearch.cluster.metadata.AliasAction.Type.*;
+import static org.elasticsearch.common.collect.Sets.*;
 import static org.elasticsearch.index.VersionType.*;
-import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.springframework.data.elasticsearch.core.MappingBuilder.*;
-import static org.springframework.util.CollectionUtils.isEmpty;

 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
+import java.lang.reflect.Method;
 import java.util.*;

-import org.elasticsearch.action.ListenableActionFuture;
-import org.elasticsearch.action.admin.indices.alias.get.GetAliasesRequest;
+import org.apache.commons.collections.CollectionUtils;
+import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
 import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder;
 import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
+import org.elasticsearch.action.admin.indices.mapping.delete.DeleteMappingRequest;
 import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequestBuilder;
 import org.elasticsearch.action.admin.indices.settings.get.GetSettingsRequest;
@@ -46,47 +47,48 @@ import org.elasticsearch.action.get.MultiGetRequest;
 import org.elasticsearch.action.get.MultiGetRequestBuilder;
 import org.elasticsearch.action.get.MultiGetResponse;
 import org.elasticsearch.action.index.IndexRequestBuilder;
+import org.elasticsearch.action.mlt.MoreLikeThisRequestBuilder;
 import org.elasticsearch.action.search.SearchRequestBuilder;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.action.search.SearchType;
-import org.elasticsearch.action.suggest.SuggestRequestBuilder;
-import org.elasticsearch.action.suggest.SuggestResponse;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.Requests;
 import org.elasticsearch.cluster.metadata.AliasAction;
-import org.elasticsearch.cluster.metadata.AliasMetaData;
+import org.elasticsearch.cluster.metadata.MappingMetaData;
+import org.elasticsearch.common.collect.ImmutableOpenMap;
 import org.elasticsearch.common.collect.MapBuilder;
 import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.index.query.MoreLikeThisQueryBuilder;
+import org.elasticsearch.index.query.FilterBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
+import org.elasticsearch.search.facet.FacetBuilder;
 import org.elasticsearch.search.highlight.HighlightBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
 import org.elasticsearch.search.sort.SortOrder;
-import org.elasticsearch.search.suggest.SuggestBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.data.domain.*;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.elasticsearch.ElasticsearchException;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Mapping;
 import org.springframework.data.elasticsearch.annotations.Setting;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
 import org.springframework.data.elasticsearch.core.query.*;
 import org.springframework.data.mapping.PersistentProperty;
-import org.springframework.data.util.CloseableIterator;
 import org.springframework.util.Assert;

 /**
@@ -96,9 +98,6 @@ import org.springframework.util.Assert;
 * @author Mohsin Husen
 * @author Artur Konczak
 * @author Kevin Leturc
- * @author Mason Chan
- * @author Young Gu
- * @author Oliver Gierke
 */

 public class ElasticsearchTemplate implements ElasticsearchOperations, ApplicationContextAware {
@@ -107,46 +106,28 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 	private Client client;
 	private ElasticsearchConverter elasticsearchConverter;
 	private ResultsMapper resultsMapper;
-	private String searchTimeout;

 	public ElasticsearchTemplate(Client client) {
-		this(client, new MappingElasticsearchConverter(new SimpleElasticsearchMappingContext()));
+		this(client, null, null);
 	}

 	public ElasticsearchTemplate(Client client, EntityMapper entityMapper) {
-		this(client, new MappingElasticsearchConverter(new SimpleElasticsearchMappingContext()), entityMapper);
-	}
-
-	public ElasticsearchTemplate(Client client, ElasticsearchConverter elasticsearchConverter, EntityMapper entityMapper) {
-		this(client, elasticsearchConverter, new DefaultResultMapper(elasticsearchConverter.getMappingContext(), entityMapper));
+		this(client, null, new DefaultResultMapper(entityMapper));
 	}

 	public ElasticsearchTemplate(Client client, ResultsMapper resultsMapper) {
-		this(client, new MappingElasticsearchConverter(new SimpleElasticsearchMappingContext()), resultsMapper);
+		this(client, null, resultsMapper);
 	}

 	public ElasticsearchTemplate(Client client, ElasticsearchConverter elasticsearchConverter) {
-		this(client, elasticsearchConverter, new DefaultResultMapper(elasticsearchConverter.getMappingContext()));
+		this(client, elasticsearchConverter, null);
 	}

 	public ElasticsearchTemplate(Client client, ElasticsearchConverter elasticsearchConverter, ResultsMapper resultsMapper) {
-
-		Assert.notNull(client, "Client must not be null!");
-		Assert.notNull(elasticsearchConverter, "ElasticsearchConverter must not be null!");
-		Assert.notNull(resultsMapper, "ResultsMapper must not be null!");
-
 		this.client = client;
-		this.elasticsearchConverter = elasticsearchConverter;
-		this.resultsMapper = resultsMapper;
-	}
-
-	@Override
-	public Client getClient() {
-		return client;
-	}
-
-	public void setSearchTimeout(String searchTimeout) {
-		this.searchTimeout = searchTimeout;
+		this.elasticsearchConverter = (elasticsearchConverter == null) ? new MappingElasticsearchConverter(
+				new SimpleElasticsearchMappingContext()) : elasticsearchConverter;
+		this.resultsMapper = (resultsMapper == null) ? new DefaultResultMapper(this.elasticsearchConverter.getMappingContext()) : resultsMapper;
 	}

 	@Override
@@ -262,12 +243,12 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 	}

 	@Override
-	public <T> Page<T> queryForPage(SearchQuery query, Class<T> clazz) {
+	public <T> FacetedPage<T> queryForPage(SearchQuery query, Class<T> clazz) {
 		return queryForPage(query, clazz, resultsMapper);
 	}

 	@Override
-	public <T> Page<T> queryForPage(SearchQuery query, Class<T> clazz, SearchResultMapper mapper) {
+	public <T> FacetedPage<T> queryForPage(SearchQuery query, Class<T> clazz, SearchResultMapper mapper) {
 		SearchResponse response = doSearch(prepareSearch(query, clazz), query);
 		return mapper.mapResults(response, clazz, query.getPageable());
 	}
@@ -299,14 +280,14 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 		if (query.getFilter() != null) {
 			request.setPostFilter(query.getFilter());
 		}
-		SearchResponse response = getSearchResponse(request.execute());
+		SearchResponse response = request.execute().actionGet();
 		return extractIds(response);
 	}

 	@Override
 	public <T> Page<T> queryForPage(CriteriaQuery criteriaQuery, Class<T> clazz) {
 		QueryBuilder elasticsearchQuery = new CriteriaQueryProcessor().createQueryFromCriteria(criteriaQuery.getCriteria());
-		QueryBuilder elasticsearchFilter = new CriteriaFilterProcessor().createFilterFromCriteria(criteriaQuery.getCriteria());
+		FilterBuilder elasticsearchFilter = new CriteriaFilterProcessor().createFilterFromCriteria(criteriaQuery.getCriteria());
 		SearchRequestBuilder searchRequestBuilder = prepareSearch(criteriaQuery, clazz);

 		if (elasticsearchQuery != null) {
@@ -321,103 +302,27 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati

 		if (elasticsearchFilter != null)
 			searchRequestBuilder.setPostFilter(elasticsearchFilter);
-		if (logger.isDebugEnabled()) {
-			logger.debug("doSearch query:\n" + searchRequestBuilder.toString());
-		}

-		SearchResponse response = getSearchResponse(searchRequestBuilder
-				.execute());
+		SearchResponse response = searchRequestBuilder
+				.execute().actionGet();
 		return resultsMapper.mapResults(response, clazz, criteriaQuery.getPageable());
 	}

 	@Override
-	public <T> Page<T> queryForPage(StringQuery query, Class<T> clazz) {
+	public <T> FacetedPage<T> queryForPage(StringQuery query, Class<T> clazz) {
 		return queryForPage(query, clazz, resultsMapper);
 	}

 	@Override
-	public <T> Page<T> queryForPage(StringQuery query, Class<T> clazz, SearchResultMapper mapper) {
-		SearchResponse response = getSearchResponse(prepareSearch(query, clazz).setQuery(query.getSource()).execute());
+	public <T> FacetedPage<T> queryForPage(StringQuery query, Class<T> clazz, SearchResultMapper mapper) {
+		SearchResponse response = prepareSearch(query, clazz).setQuery(query.getSource()).execute().actionGet();
 		return mapper.mapResults(response, clazz, query.getPageable());
 	}

-	@Override
-	public <T> CloseableIterator<T> stream(CriteriaQuery query, Class<T> clazz) {
-		final long scrollTimeInMillis = TimeValue.timeValueMinutes(1).millis();
-		final String initScrollId = scan(query, scrollTimeInMillis, false, clazz);
-		return doStream(initScrollId, scrollTimeInMillis, clazz, resultsMapper);
-	}
-
-	@Override
-	public <T> CloseableIterator<T> stream(SearchQuery query, Class<T> clazz) {
-		return stream(query, clazz, resultsMapper);
-	}
-
-	@Override
-	public <T> CloseableIterator<T> stream(SearchQuery query, final Class<T> clazz, final SearchResultMapper mapper) {
-		final long scrollTimeInMillis = TimeValue.timeValueMinutes(1).millis();
-		final String initScrollId = scan(query, scrollTimeInMillis, false, clazz);
-		return doStream(initScrollId, scrollTimeInMillis, clazz, mapper);
-	}
-
-	private <T> CloseableIterator<T> doStream(final String initScrollId, final long scrollTimeInMillis, final Class<T> clazz, final SearchResultMapper mapper) {
-		return new CloseableIterator<T>() {
-
-			/** As we couldn't retrieve single result with scroll, store current hits. */
-			private volatile Iterator<T> currentHits;
-
-			/** The scroll id. */
-			private volatile String scrollId = initScrollId;
-
-			/** If stream is finished (ie: cluster returns no results. */
-			private volatile boolean finished;
-
-			@Override
-			public void close() {
-				try {
-					// Clear scroll on cluster only in case of error (cause elasticsearch auto clear scroll when it's done)
-					if (!finished && scrollId != null && currentHits != null && currentHits.hasNext()) {
-						client.prepareClearScroll().addScrollId(scrollId).execute().actionGet();
-					}
-				} finally {
-					currentHits = null;
-					scrollId = null;
-				}
-			}
-
-			@Override
-			public boolean hasNext() {
-				// Test if stream is finished
-				if (finished) {
-					return false;
-				}
-				// Test if it remains hits
-				if (currentHits == null || !currentHits.hasNext()) {
-					// Do a new request
-					SearchResponse response = getSearchResponse(client.prepareSearchScroll(scrollId)
-							.setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).execute());
-					// Save hits and scroll id
-					currentHits = mapper.mapResults(response, clazz, null).iterator();
-					finished = !currentHits.hasNext();
-					scrollId = response.getScrollId();
-				}
-				return currentHits.hasNext();
-			}
-
-			@Override
-			public T next() {
-				if (hasNext()) {
-					return currentHits.next();
-				}
-				throw new NoSuchElementException();
-			}
-		};
-	}
-
 	@Override
 	public <T> long count(CriteriaQuery criteriaQuery, Class<T> clazz) {
 		QueryBuilder elasticsearchQuery = new CriteriaQueryProcessor().createQueryFromCriteria(criteriaQuery.getCriteria());
-		QueryBuilder elasticsearchFilter = new CriteriaFilterProcessor().createFilterFromCriteria(criteriaQuery.getCriteria());
+		FilterBuilder elasticsearchFilter = new CriteriaFilterProcessor().createFilterFromCriteria(criteriaQuery.getCriteria());

 		if (elasticsearchFilter == null) {
 			return doCount(prepareCount(criteriaQuery, clazz), elasticsearchQuery);
@@ -430,7 +335,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 	@Override
 	public <T> long count(SearchQuery searchQuery, Class<T> clazz) {
 		QueryBuilder elasticsearchQuery = searchQuery.getQuery();
-		QueryBuilder elasticsearchFilter = searchQuery.getFilter();
+		FilterBuilder elasticsearchFilter = searchQuery.getFilter();

 		if (elasticsearchFilter == null) {
 			return doCount(prepareCount(searchQuery, clazz), elasticsearchQuery);
@@ -457,7 +362,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 		return countRequestBuilder.execute().actionGet().getCount();
 	}

-	private long doCount(SearchRequestBuilder searchRequestBuilder, QueryBuilder elasticsearchQuery, QueryBuilder elasticsearchFilter) {
+	private long doCount(SearchRequestBuilder searchRequestBuilder, QueryBuilder elasticsearchQuery, FilterBuilder elasticsearchFilter) {
 		if (elasticsearchQuery != null) {
 			searchRequestBuilder.setQuery(elasticsearchQuery);
 		} else {
@@ -471,8 +376,8 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 	}

 	private <T> CountRequestBuilder prepareCount(Query query, Class<T> clazz) {
-		String indexName[] = !isEmpty(query.getIndices()) ? query.getIndices().toArray(new String[query.getIndices().size()]) : retrieveIndexNameFromPersistentEntity(clazz);
-		String types[] = !isEmpty(query.getTypes()) ? query.getTypes().toArray(new String[query.getTypes().size()]) : retrieveTypeFromPersistentEntity(clazz);
+		String indexName[] = isNotEmpty(query.getIndices()) ? query.getIndices().toArray(new String[query.getIndices().size()]) : retrieveIndexNameFromPersistentEntity(clazz);
+		String types[] = isNotEmpty(query.getTypes()) ? query.getTypes().toArray(new String[query.getTypes().size()]) : retrieveTypeFromPersistentEntity(clazz);

 		Assert.notNull(indexName, "No index defined for Query");

@@ -491,8 +396,8 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati

 	private <T> MultiGetResponse getMultiResponse(Query searchQuery, Class<T> clazz) {

-		String indexName = !isEmpty(searchQuery.getIndices()) ? searchQuery.getIndices().get(0) : getPersistentEntityFor(clazz).getIndexName();
-		String type = !isEmpty(searchQuery.getTypes()) ? searchQuery.getTypes().get(0) : getPersistentEntityFor(clazz).getIndexType();
+		String indexName = isNotEmpty(searchQuery.getIndices()) ? searchQuery.getIndices().get(0) : getPersistentEntityFor(clazz).getIndexName();
+		String type = isNotEmpty(searchQuery.getTypes()) ? searchQuery.getTypes().get(0) : getPersistentEntityFor(clazz).getIndexType();

 		Assert.notNull(indexName, "No index defined for Query");
 		Assert.notNull(type, "No type define for Query");
@@ -533,10 +438,6 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati

 	@Override
 	public UpdateResponse update(UpdateQuery query) {
-		return this.prepareUpdate(query).execute().actionGet();
-	}
-
-	private UpdateRequestBuilder prepareUpdate(UpdateQuery query) {
 		String indexName = isNotBlank(query.getIndexName()) ? query.getIndexName() : getPersistentEntityFor(query.getClazz()).getIndexName();
 		String type = isNotBlank(query.getType()) ? query.getType() : getPersistentEntityFor(query.getClazz()).getIndexType();
 		Assert.notNull(indexName, "No index defined for Query");
@@ -544,22 +445,16 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 		Assert.notNull(query.getId(), "No Id define for Query");
 		Assert.notNull(query.getUpdateRequest(), "No IndexRequest define for Query");
 		UpdateRequestBuilder updateRequestBuilder = client.prepareUpdate(indexName, type, query.getId());
-		updateRequestBuilder.setRouting(query.getUpdateRequest().routing());
-
-		if (query.getUpdateRequest().script() == null) {
-			// doc
-			if (query.DoUpsert()) {
-				updateRequestBuilder.setDocAsUpsert(true)
-						.setDoc(query.getUpdateRequest().doc());
-			} else {
-				updateRequestBuilder.setDoc(query.getUpdateRequest().doc());
-			}
+		if (query.DoUpsert()) {
+			updateRequestBuilder.setDocAsUpsert(true)
+					.setDoc(query.getUpdateRequest().doc())
+					.setScript(query.getUpdateRequest().script(), query.getUpdateRequest().scriptType())
+					.setScriptParams(query.getUpdateRequest().scriptParams())
+					.setScriptLang(query.getUpdateRequest().scriptLang());
 		} else {
-			// or script
-			updateRequestBuilder.setScript(query.getUpdateRequest().script());
+			updateRequestBuilder.setDoc(query.getUpdateRequest().doc());
 		}
-
-		return updateRequestBuilder;
+		return updateRequestBuilder.execute().actionGet();
 	}

 	@Override
@@ -582,26 +477,6 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 		}
 	}

-	@Override
-	public void bulkUpdate(List<UpdateQuery> queries) {
-		BulkRequestBuilder bulkRequest = client.prepareBulk();
-		for (UpdateQuery query : queries) {
-			bulkRequest.add(prepareUpdate(query));
-		}
-		BulkResponse bulkResponse = bulkRequest.execute().actionGet();
-		if (bulkResponse.hasFailures()) {
-			Map<String, String> failedDocuments = new HashMap<String, String>();
-			for (BulkItemResponse item : bulkResponse.getItems()) {
-				if (item.isFailed())
-					failedDocuments.put(item.getId(), item.getFailureMessage());
-			}
-			throw new ElasticsearchException(
-					"Bulk indexing has failures. Use ElasticsearchException.getFailedDocuments() for detailed messages ["
-							+ failedDocuments + "]", failedDocuments
-			);
-		}
-	}
-
 	@Override
 	public <T> boolean indexExists(Class<T> clazz) {
 		return indexExists(getPersistentEntityFor(clazz).getIndexName());
@@ -615,7 +490,7 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 	@Override
 	public boolean typeExists(String index, String type) {
 		return client.admin().cluster().prepareState().execute().actionGet()
-				.getState().metaData().index(index).getMappings().containsKey(type);
+				.getState().metaData().index(index).mappings().containsKey(type);
 	}

 	@Override
@@ -632,6 +507,15 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 		return false;
 	}

+	@Override
+	public void deleteType(String index, String type) {
+		ImmutableOpenMap<String, MappingMetaData> mappings = client.admin().cluster().prepareState().execute().actionGet()
+				.getState().metaData().index(index).mappings();
+		if (mappings.containsKey(type)) {
+			client.admin().indices().deleteMapping(new DeleteMappingRequest(index).types(type)).actionGet();
+		}
+	}
+
 	@Override
 	public String delete(String indexName, String type, String id) {
 		return client.prepareDelete(indexName, type, id).execute().actionGet().getId();
@@ -645,168 +529,61 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati

 	@Override
 	public <T> void delete(DeleteQuery deleteQuery, Class<T> clazz) {
-
-		String indexName = isNotBlank(deleteQuery.getIndex()) ? deleteQuery.getIndex() : getPersistentEntityFor(clazz).getIndexName();
-		String typeName = isNotBlank(deleteQuery.getType()) ? deleteQuery.getType() : getPersistentEntityFor(clazz).getIndexType();
-		Integer pageSize = deleteQuery.getPageSize() != null ? deleteQuery.getPageSize() : 1000;
-		Long scrollTimeInMillis = deleteQuery.getScrollTimeInMillis() != null ? deleteQuery.getScrollTimeInMillis() : 10000l;
-
-		SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(deleteQuery.getQuery())
-				.withIndices(indexName)
-				.withTypes(typeName)
-				.withPageable(new PageRequest(0, pageSize))
-				.build();
-
-		String scrollId = scan(searchQuery, scrollTimeInMillis, true);
-
-		BulkRequestBuilder bulkRequestBuilder = client.prepareBulk();
-		List<String> ids = new ArrayList<String>();
-		boolean hasRecords = true;
-		while (hasRecords) {
-			Page<String> page = scroll(scrollId, scrollTimeInMillis, new SearchResultMapper() {
-				@Override
-				public <T> Page<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
-					List<String> result = new ArrayList<String>();
-					for (SearchHit searchHit : response.getHits()) {
-						String id = searchHit.getId();
-						result.add(id);
-					}
-					if (result.size() > 0) {
-						return new PageImpl<T>((List<T>) result);
-					}
-					return null;
-				}
-			});
-			if (page != null && page.getContent().size() > 0) {
-				ids.addAll(page.getContent());
-			} else {
-				hasRecords = false;
-			}
-		}
-
-		for(String id : ids) {
-			bulkRequestBuilder.add(client.prepareDelete(indexName, typeName, id));
-		}
-
-		if(bulkRequestBuilder.numberOfActions() > 0) {
-			bulkRequestBuilder.execute().actionGet();
-		}
-
-		clearScroll(scrollId);
+		ElasticsearchPersistentEntity persistentEntity = getPersistentEntityFor(clazz);
+		client.prepareDeleteByQuery(persistentEntity.getIndexName()).setTypes(persistentEntity.getIndexType())
+				.setQuery(deleteQuery.getQuery()).execute().actionGet();
 	}

 	@Override
 	public void delete(DeleteQuery deleteQuery) {
 		Assert.notNull(deleteQuery.getIndex(), "No index defined for Query");
 		Assert.notNull(deleteQuery.getType(), "No type define for Query");
-		delete(deleteQuery, null);
-	}
-
-	@Override
-	public <T> void delete(CriteriaQuery criteriaQuery, Class<T> clazz) {
-		QueryBuilder elasticsearchQuery = new CriteriaQueryProcessor().createQueryFromCriteria(criteriaQuery.getCriteria());
-		Assert.notNull(elasticsearchQuery, "Query can not be null.");
-		DeleteQuery deleteQuery = new DeleteQuery();
-		deleteQuery.setQuery(elasticsearchQuery);
-		delete(deleteQuery, clazz);
-	}
-
-	@Override
-	public String scan(CriteriaQuery criteriaQuery, long scrollTimeInMillis, boolean noFields) {
-		return doScan(prepareScan(criteriaQuery, scrollTimeInMillis, noFields), criteriaQuery);
-	}
-
-	@Override
-	public <T> String scan(CriteriaQuery criteriaQuery, long scrollTimeInMillis, boolean noFields, Class<T> clazz) {
-		return doScan(prepareScan(criteriaQuery, scrollTimeInMillis, noFields, clazz), criteriaQuery);
+		client.prepareDeleteByQuery(deleteQuery.getIndex()).setTypes(deleteQuery.getType())
+				.setQuery(deleteQuery.getQuery()).execute().actionGet();
 	}

 	@Override
 	public String scan(SearchQuery searchQuery, long scrollTimeInMillis, boolean noFields) {
-		return doScan(prepareScan(searchQuery, scrollTimeInMillis, noFields), searchQuery);
-	}
-
-	@Override
-	public <T> String scan(SearchQuery searchQuery, long scrollTimeInMillis, boolean noFields, Class<T> clazz) {
-		return doScan(prepareScan(searchQuery, scrollTimeInMillis, noFields, clazz), searchQuery);
-	}
-
-	private <T> SearchRequestBuilder prepareScan(Query query, long scrollTimeInMillis, boolean noFields, Class<T> clazz) {
-		setPersistentEntityIndexAndType(query, clazz);
-		return prepareScan(query, scrollTimeInMillis, noFields);
-	}
-
-	private SearchRequestBuilder prepareScan(Query query, long scrollTimeInMillis, boolean noFields) {
-		SearchRequestBuilder requestBuilder = client.prepareSearch(toArray(query.getIndices())).setSearchType(SCAN)
-				.setTypes(toArray(query.getTypes()))
-				.setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).setFrom(0)
-				.setSize(query.getPageable().getPageSize());
-
-		if (!isEmpty(query.getFields())) {
-			requestBuilder.addFields(toArray(query.getFields()));
-		}
-
-		if (noFields) {
-			requestBuilder.setNoFields();
-		}
-		return requestBuilder;
-	}
-
-	private String doScan(SearchRequestBuilder requestBuilder, CriteriaQuery criteriaQuery) {
-		Assert.notNull(criteriaQuery.getIndices(), "No index defined for Query");
-		Assert.notNull(criteriaQuery.getTypes(), "No type define for Query");
-		Assert.notNull(criteriaQuery.getPageable(), "Query.pageable is required for scan & scroll");
-
-		QueryBuilder elasticsearchQuery = new CriteriaQueryProcessor().createQueryFromCriteria(criteriaQuery.getCriteria());
-		QueryBuilder elasticsearchFilter = new CriteriaFilterProcessor().createFilterFromCriteria(criteriaQuery.getCriteria());
-
-		if (elasticsearchQuery != null) {
-			requestBuilder.setQuery(elasticsearchQuery);
-		} else {
-			requestBuilder.setQuery(QueryBuilders.matchAllQuery());
-		}
-
-		if (elasticsearchFilter != null) {
-			requestBuilder.setPostFilter(elasticsearchFilter);
-		}
-
-		return getSearchResponse(requestBuilder.execute()).getScrollId();
-	}
-
-	private String doScan(SearchRequestBuilder requestBuilder, SearchQuery searchQuery) {
 		Assert.notNull(searchQuery.getIndices(), "No index defined for Query");
 		Assert.notNull(searchQuery.getTypes(), "No type define for Query");
 		Assert.notNull(searchQuery.getPageable(), "Query.pageable is required for scan & scroll");

+		SearchRequestBuilder requestBuilder = client.prepareSearch(toArray(searchQuery.getIndices())).setSearchType(SCAN)
+				.setQuery(searchQuery.getQuery()).setTypes(toArray(searchQuery.getTypes()))
+				.setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).setFrom(0)
+				.setSize(searchQuery.getPageable().getPageSize());
+
 		if (searchQuery.getFilter() != null) {
 			requestBuilder.setPostFilter(searchQuery.getFilter());
 		}

-		return getSearchResponse(requestBuilder.setQuery(searchQuery.getQuery()).execute()).getScrollId();
+		if (isNotEmpty(searchQuery.getFields())) {
+			requestBuilder.addFields(toArray(searchQuery.getFields()));
+		}
+
+		if (noFields) {
+			requestBuilder.setNoFields();
+		}
+		return requestBuilder.execute().actionGet().getScrollId();
 	}

 	@Override
 	public <T> Page<T> scroll(String scrollId, long scrollTimeInMillis, Class<T> clazz) {
-		SearchResponse response = getSearchResponse(client.prepareSearchScroll(scrollId)
-				.setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).execute());
+		SearchResponse response = client.prepareSearchScroll(scrollId)
+				.setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).execute().actionGet();
 		return resultsMapper.mapResults(response, clazz, null);
 	}

 	@Override
 	public <T> Page<T> scroll(String scrollId, long scrollTimeInMillis, SearchResultMapper mapper) {
-		SearchResponse response = getSearchResponse(client.prepareSearchScroll(scrollId)
-				.setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).execute());
+		SearchResponse response = client.prepareSearchScroll(scrollId)
+				.setScroll(TimeValue.timeValueMillis(scrollTimeInMillis)).execute().actionGet();
 		return mapper.mapResults(response, null, null);
 	}

-	@Override
-	public void clearScroll(String scrollId) {
-		client.prepareClearScroll().addScrollId(scrollId).execute().actionGet();
-	}
-
 	@Override
 	public <T> Page<T> moreLikeThis(MoreLikeThisQuery query, Class<T> clazz) {
-
+		int startRecord = 0;
 		ElasticsearchPersistentEntity persistentEntity = getPersistentEntityFor(clazz);
 		String indexName = isNotBlank(query.getIndexName()) ? query.getIndexName() : persistentEntity.getIndexName();
 		String type = isNotBlank(query.getType()) ? query.getType() : persistentEntity.getIndexType();
@@ -815,35 +592,56 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 		Assert.notNull(type, "No 'type' defined for MoreLikeThisQuery");
 		Assert.notNull(query.getId(), "No document id defined for MoreLikeThisQuery");

-		MoreLikeThisQueryBuilder moreLikeThisQueryBuilder = moreLikeThisQuery()
-				.addLikeItem(new MoreLikeThisQueryBuilder.Item(indexName, type, query.getId()));
+		MoreLikeThisRequestBuilder requestBuilder = client.prepareMoreLikeThis(indexName, type, query.getId());

+		if (query.getPageable() != null) {
+			startRecord = query.getPageable().getPageNumber() * query.getPageable().getPageSize();
+			requestBuilder.setSearchSize(query.getPageable().getPageSize());
+		}
+		requestBuilder.setSearchFrom(startRecord);
+
+		if (isNotEmpty(query.getSearchIndices())) {
+			requestBuilder.setSearchIndices(toArray(query.getSearchIndices()));
+		}
+		if (isNotEmpty(query.getSearchTypes())) {
+			requestBuilder.setSearchTypes(toArray(query.getSearchTypes()));
+		}
+		if (isNotEmpty(query.getFields())) {
+			requestBuilder.setField(toArray(query.getFields()));
+		}
+		if (isNotBlank(query.getRouting())) {
+			requestBuilder.setRouting(query.getRouting());
+		}
+		if (query.getPercentTermsToMatch() != null) {
+			requestBuilder.setPercentTermsToMatch(query.getPercentTermsToMatch());
+		}
 		if (query.getMinTermFreq() != null) {
-			moreLikeThisQueryBuilder.minTermFreq(query.getMinTermFreq());
+			requestBuilder.setMinTermFreq(query.getMinTermFreq());
 		}
 		if (query.getMaxQueryTerms() != null) {
-			moreLikeThisQueryBuilder.maxQueryTerms(query.getMaxQueryTerms());
+			requestBuilder.maxQueryTerms(query.getMaxQueryTerms());
 		}
-		if (!isEmpty(query.getStopWords())) {
-			moreLikeThisQueryBuilder.stopWords(toArray(query.getStopWords()));
+		if (isNotEmpty(query.getStopWords())) {
+			requestBuilder.setStopWords(toArray(query.getStopWords()));
 		}
 		if (query.getMinDocFreq() != null) {
-			moreLikeThisQueryBuilder.minDocFreq(query.getMinDocFreq());
+			requestBuilder.setMinDocFreq(query.getMinDocFreq());
 		}
 		if (query.getMaxDocFreq() != null) {
-			moreLikeThisQueryBuilder.maxDocFreq(query.getMaxDocFreq());
+			requestBuilder.setMaxDocFreq(query.getMaxDocFreq());
 		}
 		if (query.getMinWordLen() != null) {
-			moreLikeThisQueryBuilder.minWordLength(query.getMinWordLen());
+			requestBuilder.setMinWordLen(query.getMinWordLen());
 		}
 		if (query.getMaxWordLen() != null) {
-			moreLikeThisQueryBuilder.maxWordLength(query.getMaxWordLen());
+			requestBuilder.setMaxWordLen(query.getMaxWordLen());
 		}
 		if (query.getBoostTerms() != null) {
-			moreLikeThisQueryBuilder.boostTerms(query.getBoostTerms());
+			requestBuilder.setBoostTerms(query.getBoostTerms());
 		}

-		return queryForPage(new NativeSearchQueryBuilder().withQuery(moreLikeThisQueryBuilder).build(), clazz);
+		SearchResponse response = requestBuilder.execute().actionGet();
+		return resultsMapper.mapResults(response, clazz, query.getPageable());
 	}

 	private SearchResponse doSearch(SearchRequestBuilder searchRequest, SearchQuery searchQuery) {
@@ -851,16 +649,19 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 			searchRequest.setPostFilter(searchQuery.getFilter());
 		}

-		if (!isEmpty(searchQuery.getElasticsearchSorts())) {
+		if (CollectionUtils.isNotEmpty(searchQuery.getElasticsearchSorts())) {
 			for (SortBuilder sort : searchQuery.getElasticsearchSorts()) {
 				searchRequest.addSort(sort);
 			}
 		}

-		if (!searchQuery.getScriptFields().isEmpty()) {
-			searchRequest.addField("_source");
-			for (ScriptField scriptedField : searchQuery.getScriptFields()) {
-				searchRequest.addScriptField(scriptedField.fieldName(), scriptedField.script());
+		if (CollectionUtils.isNotEmpty(searchQuery.getFacets())) {
+			for (FacetRequest facetRequest : searchQuery.getFacets()) {
+				FacetBuilder facet = facetRequest.getFacet();
+				if (facetRequest.applyQueryFilter() && searchQuery.getFilter() != null) {
+					facet.facetFilter(searchQuery.getFilter());
+				}
+				searchRequest.addFacet(facet);
 			}
 		}

@@ -870,22 +671,13 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 			}
 		}

-		if (!isEmpty(searchQuery.getIndicesBoost())) {
-			for (IndexBoost indexBoost : searchQuery.getIndicesBoost()) {
-				searchRequest.addIndexBoost(indexBoost.getIndexName(), indexBoost.getBoost());
-			}
-		}
-
-		if (!isEmpty(searchQuery.getAggregations())) {
+		if (CollectionUtils.isNotEmpty(searchQuery.getAggregations())) {
 			for (AbstractAggregationBuilder aggregationBuilder : searchQuery.getAggregations()) {
 				searchRequest.addAggregation(aggregationBuilder);
 			}
 		}
-		return getSearchResponse(searchRequest.setQuery(searchQuery.getQuery()).execute());
-	}

-	private SearchResponse getSearchResponse(ListenableActionFuture<SearchResponse> response) {
-		return searchTimeout == null ? response.actionGet() : response.actionGet(searchTimeout);
+		return searchRequest.setQuery(searchQuery.getQuery()).execute().actionGet();
 	}

 	private <T> boolean createIndexIfNotCreated(Class<T> clazz) {
@@ -926,10 +718,6 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 	}

 	private <T> Map getDefaultSettings(ElasticsearchPersistentEntity<T> persistentEntity) {
-
-		if (persistentEntity.isUseServerConfiguration())
-			return new HashMap();
-
 		return new MapBuilder<String, String>().put("index.number_of_shards", String.valueOf(persistentEntity.getShards()))
 				.put("index.number_of_replicas", String.valueOf(persistentEntity.getReplicas()))
 				.put("index.refresh_interval", persistentEntity.getRefreshInterval())
@@ -949,7 +737,12 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 	}

 	private <T> SearchRequestBuilder prepareSearch(Query query, Class<T> clazz) {
-		setPersistentEntityIndexAndType(query, clazz);
+		if (query.getIndices().isEmpty()) {
+			query.addIndices(retrieveIndexNameFromPersistentEntity(clazz));
+		}
+		if (query.getTypes().isEmpty()) {
+			query.addTypes(retrieveTypeFromPersistentEntity(clazz));
+		}
 		return prepareSearch(query);
 	}

@@ -961,11 +754,6 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 		SearchRequestBuilder searchRequestBuilder = client.prepareSearch(toArray(query.getIndices()))
 				.setSearchType(query.getSearchType()).setTypes(toArray(query.getTypes()));

-		if (query.getSourceFilter() != null) {
-			SourceFilter sourceFilter = query.getSourceFilter();
-			searchRequestBuilder.setFetchSource(sourceFilter.getIncludes(), sourceFilter.getExcludes());
-		}
-
 		if (query.getPageable() != null) {
 			startRecord = query.getPageable().getPageNumber() * query.getPageable().getPageSize();
 			searchRequestBuilder.setSize(query.getPageable().getPageSize());
@@ -1031,14 +819,15 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 	}

 	@Override
-	public void refresh(String indexName) {
-		Assert.notNull(indexName, "No index defined for refresh()");
-		client.admin().indices().refresh(refreshRequest(indexName)).actionGet();
+	public void refresh(String indexName, boolean waitForOperation) {
+		client.admin().indices().refresh(refreshRequest(indexName).force(waitForOperation)).actionGet();
 	}

 	@Override
-	public <T> void refresh(Class<T> clazz) {
-		refresh(getPersistentEntityFor(clazz).getIndexName());
+	public <T> void refresh(Class<T> clazz, boolean waitForOperation) {
+		ElasticsearchPersistentEntity persistentEntity = getPersistentEntityFor(clazz);
+		client.admin().indices()
+				.refresh(refreshRequest(persistentEntity.getIndexName()).force(waitForOperation)).actionGet();
 	}

 	@Override
@@ -1069,43 +858,49 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 	}

 	@Override
-	public List<AliasMetaData> queryForAlias(String indexName) {
-		return client.admin().indices().getAliases(new GetAliasesRequest().indices(indexName))
-				.actionGet().getAliases().get(indexName);
+	public Set<String> queryForAlias(String indexName) {
+		ClusterStateRequest clusterStateRequest = Requests.clusterStateRequest()
+				.routingTable(true).nodes(true).indices(indexName);
+		Iterator<String> iterator = client.admin().cluster().state(clusterStateRequest).actionGet().getState().getMetaData().aliases().keysIt();
+		return newHashSet(iterator);
 	}

-	@Override
-	public ElasticsearchPersistentEntity getPersistentEntityFor(Class clazz) {
+	private ElasticsearchPersistentEntity getPersistentEntityFor(Class clazz) {
 		Assert.isTrue(clazz.isAnnotationPresent(Document.class), "Unable to identify index name. " + clazz.getSimpleName()
 				+ " is not a Document. Make sure the document class is annotated with @Document(indexName=\"foo\")");
 		return elasticsearchConverter.getMappingContext().getPersistentEntity(clazz);
 	}

 	private String getPersistentEntityId(Object entity) {
-		
-		ElasticsearchPersistentEntity<?> persistentEntity = getPersistentEntityFor(entity.getClass());
-		Object identifier = persistentEntity.getIdentifierAccessor(entity).getIdentifier();
-		
-		return identifier == null ? null : String.valueOf(identifier);
+		PersistentProperty idProperty = getPersistentEntityFor(entity.getClass()).getIdProperty();
+		if (idProperty != null) {
+			Method getter = idProperty.getGetter();
+			if (getter != null) {
+				try {
+					Object id = getter.invoke(entity);
+					if (id != null) {
+						return String.valueOf(id);
+					}
+				} catch (Throwable t) {
+					t.printStackTrace();
+				}
+			}
+		}
+		return null;
 	}

 	private void setPersistentEntityId(Object entity, String id) {
-		
-		ElasticsearchPersistentEntity<?> persistentEntity = getPersistentEntityFor(entity.getClass());
-		PersistentProperty<?> idProperty = persistentEntity.getIdProperty();
-		
+		PersistentProperty idProperty = getPersistentEntityFor(entity.getClass()).getIdProperty();
 		// Only deal with String because ES generated Ids are strings !
 		if (idProperty != null && idProperty.getType().isAssignableFrom(String.class)) {
-			persistentEntity.getPropertyAccessor(entity).setProperty(idProperty,id);
-		}
-	}
-
-	private void setPersistentEntityIndexAndType(Query query, Class clazz) {
-		if (query.getIndices().isEmpty()) {
-			query.addIndices(retrieveIndexNameFromPersistentEntity(clazz));
-		}
-		if (query.getTypes().isEmpty()) {
-			query.addTypes(retrieveTypeFromPersistentEntity(clazz));
+			Method setter = idProperty.getSetter();
+			if (setter != null) {
+				try {
+					setter.invoke(entity, id);
+				} catch (Throwable t) {
+					t.printStackTrace();
+				}
+			}
 		}
 	}

@@ -1164,9 +959,8 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati
 			bufferedReader = new BufferedReader(inputStreamReader);
 			String line;

-			String lineSeparator = System.getProperty("line.separator");
 			while ((line = bufferedReader.readLine()) != null) {
-				stringBuilder.append(line).append(lineSeparator);
+				stringBuilder.append(line);
 			}
 		} catch (Exception e) {
 			logger.debug(String.format("Failed to load file from url: %s: %s", url, e.getMessage()));
@@ -1182,14 +976,4 @@ public class ElasticsearchTemplate implements ElasticsearchOperations, Applicati

 		return stringBuilder.toString();
 	}
-
-	public SuggestResponse suggest(SuggestBuilder.SuggestionBuilder<?> suggestion, String... indices) {
-		SuggestRequestBuilder suggestRequestBuilder = client.prepareSuggest(indices);
-		suggestRequestBuilder.addSuggestion(suggestion);
-		return suggestRequestBuilder.execute().actionGet();
-	}
-
-	public SuggestResponse suggest(SuggestBuilder.SuggestionBuilder<?> suggestion, Class clazz) {
-		return suggest(suggestion, retrieveIndexNameFromPersistentEntity(clazz));
-	}
 }
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -0,0 +1,36 @@
+/*
+ * 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;
+
+import java.util.List;
+
+import org.springframework.data.domain.Page;
+import org.springframework.data.elasticsearch.core.facet.FacetResult;
+
+/**
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ * @author Jonathan Yan
+ */
+public interface FacetedPage<T> extends Page<T> {
+
+	boolean hasFacets();
+
+	List<FacetResult> getFacets();
+
+	FacetResult getFacet(String name);
+}
@@ -0,0 +1,70 @@
+/*
+ * 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;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.core.facet.FacetResult;
+
+/**
+ * Container for query result and facet results
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ * @author Jonathan Yan
+ */
+public class FacetedPageImpl<T> extends PageImpl<T> implements FacetedPage<T> {
+
+	private List<FacetResult> facets;
+	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, 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() {
+		return CollectionUtils.isNotEmpty(facets);
+	}
+
+	@Override
+	public List<FacetResult> getFacets() {
+		return facets;
+	}
+
+	@Override
+	public FacetResult getFacet(String name) {
+		return mapOfFacets.get(name);
+	}
+}
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -1,11 +1,11 @@
 /*
- * 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -20,19 +20,14 @@ 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.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
 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.*;
-import org.springframework.data.elasticsearch.core.completion.Completion;
+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;
@@ -42,11 +37,8 @@ import org.springframework.data.util.TypeInformation;
 * @author Rizwan Idrees
 * @author Mohsin Husen
 * @author Artur Konczak
- * @author Kevin Leturc
- * @author Alexander Volz
- * @author Dennis Maaß
- * @author Mark Paluch
 */
+
 class MappingBuilder {

 	public static final String FIELD_STORE = "store";
@@ -54,21 +46,13 @@ class MappingBuilder {
 	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_PAYLOADS = "payloads";
-	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 = "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 = new SimpleTypeHolder();

@@ -83,27 +67,22 @@ 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) {
@@ -112,27 +91,15 @@ class MappingBuilder {
 				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, singleField.type());
 				if (nestedOrObject) {
 					continue;
 				}
@@ -140,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);
 			}
 		}

@@ -163,65 +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<java.lang.reflect.Field>();
-
-		// 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);
-
-		GeoPointField annotation = field.getAnnotation(GeoPointField.class);
-		if (annotation != null) {
-			if (annotation.geoHashPrefix()) {
-				xContentBuilder.field(TYPE_VALUE_GEO_HASH_PREFIX, true);
-				if (StringUtils.isNotEmpty(annotation.geoHashPrecision())) {
-					if (NumberUtils.isNumber(annotation.geoHashPrecision())) {
-						xContentBuilder.field(TYPE_VALUE_GEO_HASH_PRECISION, Integer.parseInt(annotation.geoHashPrecision()));
-					} else {
-						xContentBuilder.field(TYPE_VALUE_GEO_HASH_PRECISION, annotation.geoHashPrecision());
-					}
-				}
-			}
-		}
-
-		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_PAYLOADS, annotation.payloads());
-			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)
@@ -238,11 +149,9 @@ class MappingBuilder {
 	 * @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());
-		}
+		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()) {
@@ -250,14 +159,14 @@ class MappingBuilder {
 						? fieldAnnotation.pattern() : fieldAnnotation.format());
 			}
 		}
-		if (FieldIndex.not_analyzed == fieldAnnotation.index() || FieldIndex.no == 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();
 	}
@@ -268,9 +177,9 @@ class MappingBuilder {
 	 * @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());
 		}
@@ -292,19 +201,46 @@ class MappingBuilder {
 	 * @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, "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)
+	 *
+	 * @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
+	 *
+	 * @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);
@@ -313,20 +249,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) {
@@ -358,11 +286,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;
-	}
 }
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -19,6 +19,5 @@ package org.springframework.data.elasticsearch.core;
 import org.elasticsearch.action.search.SearchResponse;

 public interface ResultsExtractor<T> {
-
 	T extract(SearchResponse response);
 }
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -16,7 +16,6 @@
 package org.springframework.data.elasticsearch.core;

 import org.elasticsearch.action.search.SearchResponse;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;

 /**
@@ -24,5 +23,5 @@ import org.springframework.data.domain.Pageable;
 */
 public interface SearchResultMapper {

-	<T> Page<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable);
+	<T> FacetedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable);
 }
@@ -1,57 +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 String output;
-	private Integer weight;
-	private Object payload;
-
-	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 String getOutput() {
-		return output;
-	}
-
-	public void setOutput(String output) {
-		this.output = output;
-	}
-
-	public Object getPayload() {
-		return payload;
-	}
-
-	public void setPayload(Object payload) {
-		this.payload = payload;
-	}
-
-	public Integer getWeight() {
-		return weight;
-	}
-
-	public void setWeight(Integer weight) {
-		this.weight = weight;
-	}
-}
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -1,11 +1,11 @@
 /*
- * 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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();
 	}
@@ -0,0 +1,45 @@
+/*
+ * 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 org.springframework.util.Assert;
+
+/**
+ * @author Artur Konczak
+ */
+public abstract class AbstractFacetRequest implements FacetRequest {
+
+	private String name;
+	private boolean applyQueryFilter;
+
+	public AbstractFacetRequest(String name) {
+		Assert.hasText(name, "Facet can't be null or empty !!!");
+		this.name = name;
+	}
+
+	protected String getName() {
+		return name;
+	}
+
+	public void setApplyQueryFilter(boolean applyQueryFilter) {
+		this.applyQueryFilter = applyQueryFilter;
+	}
+
+	@Override
+	public boolean applyQueryFilter() {
+		return applyQueryFilter;
+	}
+}
@@ -0,0 +1,46 @@
+/*
+ * 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 org.springframework.util.Assert;
+
+/**
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ * @author Jonathan Yan
+ */
+public class AbstractFacetResult implements FacetResult {
+
+	private final String name;
+	private final FacetType type;
+
+	protected AbstractFacetResult(String name, FacetType type) {
+		Assert.hasText(name, "Facet name can't be null and should have a value");
+		this.name = name;
+		this.type = type;
+	}
+
+	@Override
+	public String getName() {
+		return name;
+	}
+
+	@Override
+	public FacetType getType() {
+		return type;
+	}
+}
@@ -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);
+	}
+}
@@ -0,0 +1,31 @@
+/*
+ * 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 org.elasticsearch.search.facet.FacetBuilder;
+
+/**
+ * @author Artur Koczak
+ */
+public interface FacetRequest {
+
+	public static final String FIELD_UNTOUCHED = "untouched";
+	public static final String FIELD_SORT = "sort";
+
+	FacetBuilder getFacet();
+
+	boolean applyQueryFilter();
+}
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -13,16 +13,19 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.springframework.data.elasticsearch.repositories.synonym;
-
-import org.springframework.data.elasticsearch.entities.SynonymEntity;
-import org.springframework.data.elasticsearch.repository.ElasticsearchCrudRepository;
+package org.springframework.data.elasticsearch.core.facet;

 /**
- * SynonymRepository
+ * Generic interface for all facets
 *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
 * @author Artur Konczak
+ * @author Jonathan Yan
 */
-public interface SynonymRepository extends ElasticsearchCrudRepository<SynonymEntity, String> {
+public interface FacetResult {

+	String getName();
+
+	FacetType getType();
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -13,16 +13,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.springframework.data.elasticsearch.core.query;
+package org.springframework.data.elasticsearch.core.facet;

 /**
- * SourceFilter for providing includes and excludes.
- *
- * @Author Jon Tsiros
+ * @author Artur Konczak
+ * @author Petar Tahchiev
 */
-public interface SourceFilter {
+public enum FacetType {

-	String[] getIncludes();
+	term, range, histogram, statistical

-	String[] getExcludes();
 }
@@ -0,0 +1,69 @@
+/*
+ * 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.request;
+
+import java.util.concurrent.TimeUnit;
+
+import org.apache.commons.lang.StringUtils;
+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
+ */
+public class HistogramFacetRequest extends AbstractFacetRequest {
+
+	private String field;
+	private long interval;
+	private TimeUnit timeUnit;
+
+	public HistogramFacetRequest(String name) {
+		super(name);
+	}
+
+	public void setField(String field) {
+		this.field = field;
+	}
+
+	public void setInterval(long interval) {
+		this.interval = interval;
+	}
+
+	public void setTimeUnit(TimeUnit timeUnit) {
+		this.timeUnit = timeUnit;
+	}
+
+	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 !!!");
+
+		HistogramFacetBuilder builder = FacetBuilders.histogramFacet(getName());
+		builder.field(field);
+
+		if (timeUnit != null) {
+			builder.interval(interval, timeUnit);
+		} else {
+			builder.interval(interval);
+		}
+
+		return builder;
+	}
+}
@@ -0,0 +1,56 @@
+/*
+ * 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.request;
+
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
+
+/**
+ * @author Artur Konczak
+ */
+public class HistogramFacetRequestBuilder {
+
+	HistogramFacetRequest result;
+
+	public HistogramFacetRequestBuilder(String name) {
+		result = new HistogramFacetRequest(name);
+	}
+
+	public HistogramFacetRequestBuilder field(String field) {
+		result.setField(field);
+		return this;
+	}
+
+	public HistogramFacetRequestBuilder interval(long interval) {
+		result.setInterval(interval);
+		return this;
+	}
+
+	public HistogramFacetRequestBuilder timeUnit(TimeUnit timeUnit) {
+		result.setTimeUnit(timeUnit);
+		return this;
+	}
+
+	public FacetRequest build() {
+		return result;
+	}
+
+	public HistogramFacetRequestBuilder applyQueryFilter() {
+		result.setApplyQueryFilter(true);
+		return this;
+	}
+}
@@ -0,0 +1,48 @@
+/*
+ * 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.request;
+
+import org.elasticsearch.search.facet.FacetBuilder;
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
+
+/**
+ * @author Artur Konczak
+ * @author Mohsin Husen
+ */
+public class NativeFacetRequest implements FacetRequest {
+
+	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 FacetBuilder getFacet() {
+		return facet;
+	}
+
+	@Override
+	public boolean applyQueryFilter() {
+		return applyQueryFilter;
+	}
+}
@@ -0,0 +1,132 @@
+/*
+ * 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.request;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+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
+ */
+public class RangeFacetRequest extends AbstractFacetRequest {
+
+	private String field;
+	private String keyField;
+	private String valueField;
+
+	private List<Entry> entries = new ArrayList<Entry>();
+
+	public RangeFacetRequest(String name) {
+		super(name);
+	}
+
+	public void setField(String field) {
+		this.field = field;
+	}
+
+	public void setFields(String keyField, String valueField) {
+		this.keyField = keyField;
+		this.valueField = valueField;
+	}
+
+	public void range(Double from, Double to) {
+		entries.add(new DoubleEntry(from, to));
+	}
+
+	public void range(String from, String to) {
+		entries.add(new StringEntry(from, to));
+	}
+
+	public void addRange(Double from, Double to) {
+		entries.add(new DoubleEntry(from, to));
+	}
+
+	public void addRange(String from, String to) {
+		entries.add(new StringEntry(from, to));
+	}
+
+	@Override
+	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 !!!");
+
+		RangeFacetBuilder builder = FacetBuilders.rangeFacet(getName());
+		if (StringUtils.isNotBlank(keyField)) {
+			builder.keyField(keyField).valueField(valueField);
+		} else {
+			builder.field(field);
+		}
+
+		for (Entry entry : entries) {
+			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());
+			}
+		}
+
+		return builder;
+	}
+
+	private double validateValue(Double value, double defaultValue) {
+		return value == null ? defaultValue : value;
+	}
+
+	static class DoubleEntry extends Entry<Double> {
+
+		DoubleEntry(Double from, Double to) {
+			super(from, to);
+		}
+	}
+
+	static class StringEntry extends Entry<String> {
+
+		StringEntry(String from, String to) {
+			super(from, to);
+		}
+	}
+
+	static class Entry<T> {
+
+		T from;
+		T to;
+
+		Entry(T from, T to) {
+			this.from = from;
+			this.to = to;
+		}
+
+		public T getFrom() {
+			return from;
+		}
+
+		public T getTo() {
+			return to;
+		}
+	}
+}
@@ -0,0 +1,82 @@
+/*
+ * 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.request;
+
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
+
+/**
+ * Basic range facet
+ *
+ * @author Artur Konczak
+ */
+public class RangeFacetRequestBuilder {
+
+	RangeFacetRequest result;
+
+	public RangeFacetRequestBuilder(String name) {
+		result = new RangeFacetRequest(name);
+	}
+
+	public RangeFacetRequestBuilder field(String field) {
+		result.setField(field);
+		return this;
+	}
+
+	public RangeFacetRequestBuilder fields(String keyField, String valueField) {
+		result.setFields(keyField, valueField);
+		return this;
+	}
+
+
+	public RangeFacetRequestBuilder range(double from, double to) {
+		result.range(from, to);
+		return this;
+	}
+
+	public RangeFacetRequestBuilder range(String from, String to) {
+		result.range(from, to);
+		return this;
+	}
+
+	public RangeFacetRequestBuilder from(double from) {
+		result.range(from, null);
+		return this;
+	}
+
+	public RangeFacetRequestBuilder to(double to) {
+		result.range(null, to);
+		return this;
+	}
+
+	public RangeFacetRequestBuilder from(String from) {
+		result.range(from, null);
+		return this;
+	}
+
+	public RangeFacetRequestBuilder to(String to) {
+		result.range(null, to);
+		return this;
+	}
+
+	public RangeFacetRequestBuilder applyQueryFilter() {
+		result.setApplyQueryFilter(true);
+		return this;
+	}
+
+	public FacetRequest build() {
+		return result;
+	}
+}
@@ -0,0 +1,60 @@
+/*
+ * 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.request;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
+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
+ */
+public class StatisticalFacetRequest extends AbstractFacetRequest {
+
+	private String field;
+
+	private String[] fields;
+
+	public StatisticalFacetRequest(String name) {
+		super(name);
+	}
+
+	public void setField(String field) {
+		this.field = field;
+	}
+
+	public void setFields(String... fields) {
+		this.fields = fields;
+	}
+
+	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 !!!");
+
+		StatisticalFacetBuilder builder = FacetBuilders.statisticalFacet(getName());
+		if (ArrayUtils.isNotEmpty(fields)) {
+			builder.fields(fields);
+		} else {
+			builder.field(field);
+		}
+
+		return builder;
+	}
+}
@@ -0,0 +1,49 @@
+/*
+ * 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.request;
+
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
+
+/**
+ * @author Petar Tahchiev
+ */
+public class StatisticalFacetRequestBuilder {
+
+	StatisticalFacetRequest result;
+
+	public StatisticalFacetRequestBuilder(String name) {
+		result = new StatisticalFacetRequest(name);
+	}
+
+	public StatisticalFacetRequestBuilder field(String field) {
+		result.setField(field);
+		return this;
+	}
+
+	public StatisticalFacetRequestBuilder fields(String... fields) {
+		result.setFields(fields);
+		return this;
+	}
+
+	public StatisticalFacetRequestBuilder applyQueryFilter() {
+		result.setApplyQueryFilter(true);
+		return this;
+	}
+
+	public FacetRequest build() {
+		return result;
+	}
+}
@@ -1,11 +1,11 @@
 /*
- * Copyright 2016 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -13,12 +13,14 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.springframework.data.elasticsearch.immutable;
-
-import org.springframework.data.repository.CrudRepository;
+package org.springframework.data.elasticsearch.core.facet.request;

 /**
- * @author Young Gu
- * @author Oliver Gierke
+ * @author Artur Konczak
+ * @author Mohsin Husen
 */
-public interface ImmutableElasticsearchRepository extends CrudRepository<ImmutableEntity, String> {}
+public enum TermFacetOrder {
+
+	ascTerm, descTerm, ascCount, descCount;
+
+}
@@ -0,0 +1,108 @@
+/*
+ * 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.request;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
+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
+ */
+public class TermFacetRequest extends AbstractFacetRequest {
+
+	private String[] fields;
+	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) {
+		this.fields = fields;
+	}
+
+	public void setSize(int size) {
+		Assert.isTrue(size >= 0, "Size should be bigger then zero !!!");
+		this.size = size;
+	}
+
+	public void setOrder(TermFacetOrder order) {
+		this.order = order;
+	}
+
+	public void setExcludeTerms(Object... excludeTerms) {
+		this.excludeTerms = excludeTerms;
+	}
+
+	public void setAllTerms(boolean allTerms) {
+		this.allTerms = allTerms;
+	}
+
+	public void setRegex(String regex) {
+		this.regex = regex;
+	}
+
+	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:
+				builder.order(TermsFacet.ComparatorType.REVERSE_TERM);
+				break;
+			case ascTerm:
+				builder.order(TermsFacet.ComparatorType.TERM);
+				break;
+			case ascCount:
+				builder.order(TermsFacet.ComparatorType.REVERSE_COUNT);
+				break;
+			default:
+				builder.order(TermsFacet.ComparatorType.COUNT);
+		}
+		if (ArrayUtils.isNotEmpty(excludeTerms)) {
+			builder.exclude(excludeTerms);
+		}
+
+		if (allTerms) {
+			builder.allTerms(allTerms);
+		}
+
+		if (StringUtils.isNotBlank(regex)) {
+			builder.regex(regex, regexFlag);
+		}
+
+		return builder;
+	}
+}
@@ -0,0 +1,91 @@
+/*
+ * 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.request;
+
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
+
+/**
+ * Basic term facet
+ *
+ * @author Artur Konczak
+ */
+public class TermFacetRequestBuilder {
+
+	private TermFacetRequest result;
+
+	public TermFacetRequestBuilder(String name) {
+		result = new TermFacetRequest(name);
+	}
+
+	public TermFacetRequestBuilder fields(String... fields) {
+		result.setFields(fields);
+		return this;
+	}
+
+	public TermFacetRequestBuilder size(int size) {
+		result.setSize(size);
+		return this;
+	}
+
+	public TermFacetRequestBuilder excludeTerms(Object... terms) {
+		result.setExcludeTerms(terms);
+		return this;
+	}
+
+	public TermFacetRequestBuilder allTerms() {
+		result.setAllTerms(true);
+		return this;
+	}
+
+	public TermFacetRequestBuilder regex(String regex) {
+		result.setRegex(regex);
+		return this;
+	}
+
+	public TermFacetRequestBuilder regex(String regex, int regexFlag) {
+		result.setRegex(regex, regexFlag);
+		return this;
+	}
+
+	public TermFacetRequestBuilder ascTerm() {
+		result.setOrder(TermFacetOrder.ascTerm);
+		return this;
+	}
+
+	public TermFacetRequestBuilder descTerm() {
+		result.setOrder(TermFacetOrder.descTerm);
+		return this;
+	}
+
+	public TermFacetRequestBuilder ascCount() {
+		result.setOrder(TermFacetOrder.ascCount);
+		return this;
+	}
+
+	public TermFacetRequestBuilder descCount() {
+		result.setOrder(TermFacetOrder.descCount);
+		return this;
+	}
+
+	public TermFacetRequestBuilder applyQueryFilter() {
+		result.setApplyQueryFilter(true);
+		return this;
+	}
+
+	public FacetRequest build() {
+		return result;
+	}
+}
@@ -0,0 +1,38 @@
+/*
+ * 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.result;
+
+import java.util.List;
+
+import org.springframework.data.elasticsearch.core.facet.AbstractFacetResult;
+import org.springframework.data.elasticsearch.core.facet.FacetType;
+
+/**
+ * @author Artur Konczak
+ */
+public class HistogramResult extends AbstractFacetResult {
+
+	private List<IntervalUnit> terms;
+
+	public HistogramResult(String name, List<IntervalUnit> terms) {
+		super(name, FacetType.term);
+		this.terms = terms;
+	}
+
+	public List<IntervalUnit> getIntervalUnit() {
+		return terms;
+	}
+}
@@ -0,0 +1,91 @@
+/*
+ * 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.result;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * Single term
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ * @author Jonathan Yan
+ */
+public class IntervalUnit {
+
+	private static final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+	long key;
+	long count;
+	long totalCount;
+	double total;
+	double mean;
+	double min;
+	double max;
+
+	public IntervalUnit(long key, long count, long totalCount, double total, double mean, double min, double max) {
+		this.key = key;
+		this.count = count;
+		this.totalCount = totalCount;
+		this.total = total;
+		this.mean = mean;
+		this.min = min;
+		this.max = max;
+	}
+
+	public long getKey() {
+		return key;
+	}
+
+	public long getCount() {
+		return count;
+	}
+
+	public long getTotalCount() {
+		return totalCount;
+	}
+
+	public double getTotal() {
+		return total;
+	}
+
+	public double getMean() {
+		return mean;
+	}
+
+	public double getMin() {
+		return min;
+	}
+
+	public double getMax() {
+		return max;
+	}
+
+	@Override
+	public String toString() {
+		return "IntervalUnit{" +
+				"key=" + format.format(new Date(key)) +
+				", count=" + count +
+				", totalCount=" + totalCount +
+				", total=" + total +
+				", mean=" + mean +
+				", min=" + min +
+				", max=" + max +
+				'}';
+	}
+}
@@ -0,0 +1,78 @@
+/*
+ * 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.result;
+
+/**
+ * Single range
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ * @author Jonathan Yan
+ */
+public class Range {
+
+	private Double from;
+	private Double to;
+	private long count;
+	private double total;
+	private double totalCount;
+	private double min = Double.POSITIVE_INFINITY;
+	private double max = Double.NEGATIVE_INFINITY;
+
+	public Range(Double from, Double to, long count, double total, double totalCount, double min, double max) {
+		this.from = from;
+		this.to = to;
+		this.count = count;
+		this.total = total;
+		this.totalCount = totalCount;
+		this.min = min;
+		this.max = max;
+	}
+
+	public Double getFrom() {
+		return from;
+	}
+
+	public Double getTo() {
+		return to;
+	}
+
+	/**
+	 * Return number of documents in range
+	 *
+	 * @return
+	 */
+	public long getCount() {
+		return count;
+	}
+
+	public double getTotal() {
+		return total;
+	}
+
+	public double getTotalCount() {
+		return totalCount;
+	}
+
+	public double getMin() {
+		return min;
+	}
+
+	public double getMax() {
+		return max;
+	}
+}
@@ -0,0 +1,43 @@
+/*
+ * 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.result;
+
+import java.util.List;
+
+import org.springframework.data.elasticsearch.core.facet.AbstractFacetResult;
+import org.springframework.data.elasticsearch.core.facet.FacetType;
+
+/**
+ * Basic term facet result
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ * @author Jonathan Yan
+ */
+public class RangeResult extends AbstractFacetResult {
+
+	private List<Range> ranges;
+
+	public RangeResult(String name, List<Range> ranges) {
+		super(name, FacetType.range);
+		this.ranges = ranges;
+	}
+
+	public List<Range> getRanges() {
+		return ranges;
+	}
+}
@@ -0,0 +1,85 @@
+/*
+ * 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.result;
+
+import org.springframework.data.elasticsearch.core.facet.AbstractFacetResult;
+import org.springframework.data.elasticsearch.core.facet.FacetType;
+
+/**
+ * @author Petar Tahchiev
+ */
+public class StatisticalResult extends AbstractFacetResult {
+
+	private long count;
+
+	private double max;
+
+	private double min;
+
+	private double mean;
+
+	private double stdDeviation;
+
+	private double sumOfSquares;
+
+	private double total;
+
+	private double variance;
+
+	public StatisticalResult(String name, long count, double max, double min, double mean, double stdDeviation, double sumOfSquares, double total, double variance) {
+		super(name, FacetType.statistical);
+		this.count = count;
+		this.max = max;
+		this.min = min;
+		this.mean = mean;
+		this.stdDeviation = stdDeviation;
+		this.sumOfSquares = sumOfSquares;
+		this.total = total;
+		this.variance = variance;
+	}
+
+	public long getCount() {
+		return count;
+	}
+
+	public double getMax() {
+		return max;
+	}
+
+	public double getMin() {
+		return min;
+	}
+
+	public double getMean() {
+		return mean;
+	}
+
+	public double getStdDeviation() {
+		return stdDeviation;
+	}
+
+	public double getSumOfSquares() {
+		return sumOfSquares;
+	}
+
+	public double getTotal() {
+		return total;
+	}
+
+	public double getVariance() {
+		return variance;
+	}
+}
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -13,16 +13,31 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-package org.springframework.data.elasticsearch.repositories.setting;
-
-import org.springframework.data.elasticsearch.entities.FieldDynamicMappingEntity;
-import org.springframework.data.elasticsearch.repository.ElasticsearchCrudRepository;
+package org.springframework.data.elasticsearch.core.facet.result;

 /**
- * FieldDynamicMappingEntityRepository
+ * Single term
 *
- * @author Ted Liang
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ * @author Jonathan Yan
 */
-public interface FieldDynamicMappingEntityRepository extends ElasticsearchCrudRepository<FieldDynamicMappingEntity, String> {
+public class Term {

+	private String term;
+	private int count;
+
+	public Term(String term, int count) {
+		this.term = term;
+		this.count = count;
+	}
+
+	public String getTerm() {
+		return term;
+	}
+
+	public int getCount() {
+		return count;
+	}
 }
@@ -0,0 +1,43 @@
+/*
+ * 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.result;
+
+import java.util.List;
+
+import org.springframework.data.elasticsearch.core.facet.AbstractFacetResult;
+import org.springframework.data.elasticsearch.core.facet.FacetType;
+
+/**
+ * Basic term facet result
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ * @author Jonathan Yan
+ */
+public class TermResult extends AbstractFacetResult {
+
+	private List<Term> terms;
+
+	public TermResult(String name, List<Term> terms) {
+		super(name, FacetType.term);
+		this.terms = terms;
+	}
+
+	public List<Term> getTerms() {
+		return terms;
+	}
+}
@@ -1,70 +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.JsonProcessingException;
-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, JsonProcessingException {
-		gen.writeObject(GeoPoint.fromPoint(value));
-//		gen.writeStartObject();
-//		gen.writeNumberField("lat", value.getY());
-//		gen.writeNumberField("lon", value.getX());
-//		gen.writeEndObject();
-	}
-}
-
-class PointDeserializer extends JsonDeserializer<Point> {
-
-	@Override
-	public Point deserialize(JsonParser p, DeserializationContext context) throws IOException, JsonProcessingException {
-
-		GeoPoint point = p.readValueAs(GeoPoint.class);
-//		Double lat = null;
-//		Double lon = null;
-//		//skipp field name
-//		p.nextFieldName();
-//		if ("lat".equals(p.getCurrentName())) {
-//			//get value
-//			p.nextFieldName();
-//			lat = p.getDoubleValue();
-//			p.nextFieldName();
-//		}
-//		if ("lon".equals(p.getCurrentName())) {
-//			//get value
-//			p.nextFieldName();
-//			lon = p.getDoubleValue();
-//		}
-//		return new Point(lon, lat);
-		return GeoPoint.toPoint(point);
-	}
-}
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- * https://www.apache.org/licenses/LICENSE-2.0
+ * 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,
@@ -1,11 +1,11 @@
 /*
- * 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.
 * You may obtain a copy of the License at
 *
- * https://www.apache.org/licenses/LICENSE-2.0
+ * 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,
@@ -21,7 +21,6 @@ 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 {

@@ -52,11 +51,7 @@ public class GeoPoint {
 	 * @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());
+		return new GeoPoint(point.getY(), point.getX());
 	}
 }

@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -34,8 +34,6 @@ public interface ElasticsearchPersistentEntity<T> extends PersistentEntity<T, El

 	short getReplicas();

-	boolean isUseServerConfiguration();
-
 	String getRefreshInterval();

 	String getIndexStoreType();
@@ -47,6 +45,4 @@ public interface ElasticsearchPersistentEntity<T> extends PersistentEntity<T, El
 	ElasticsearchPersistentProperty getParentIdProperty();

 	String settingPath();
-
-	boolean isCreateIndexAndMapping();
 }
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -50,7 +50,6 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit

 	private String indexName;
 	private String indexType;
-	private boolean useServerConfiguration;
 	private short shards;
 	private short replicas;
 	private String refreshInterval;
@@ -58,7 +57,6 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit
 	private String parentType;
 	private ElasticsearchPersistentProperty parentIdProperty;
 	private String settingPath;
-	private boolean createIndexAndMapping;

 	public SimpleElasticsearchPersistentEntity(TypeInformation<T> typeInformation) {
 		super(typeInformation);
@@ -70,14 +68,12 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit
 			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.indexName = typeInformation.getType().getAnnotation(Document.class).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();
+			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();
@@ -99,8 +95,7 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit

 	@Override
 	public String getIndexType() {
-		Expression expression = parser.parseExpression(indexType, ParserContext.TEMPLATE_EXPRESSION);
-		return expression.getValue(context, String.class);
+		return indexType;
 	}

 	@Override
@@ -118,11 +113,6 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit
 		return replicas;
 	}

-	@Override
-	public boolean isUseServerConfiguration() {
-		return useServerConfiguration;
-	}
-
 	@Override
 	public String getRefreshInterval() {
 		return refreshInterval;
@@ -143,11 +133,6 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit
 		return settingPath;
 	}

-	@Override
-	public boolean isCreateIndexAndMapping() {
-		return createIndexAndMapping;
-	}
-
 	@Override
 	public void addPersistentProperty(ElasticsearchPersistentProperty property) {
 		super.addPersistentProperty(property);
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -1,11 +1,11 @@
 /*
- * 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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,7 +31,6 @@ import org.springframework.util.Assert;
 *
 * @author Rizwan Idrees
 * @author Mohsin Husen
- * @author Mark Paluch
 */
 abstract class AbstractQuery implements Query {

@@ -38,7 +39,6 @@ abstract class AbstractQuery implements Query {
 	protected List<String> indices = new ArrayList<String>();
 	protected List<String> types = new ArrayList<String>();
 	protected List<String> fields = new ArrayList<String>();
-	protected SourceFilter sourceFilter;
 	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) {
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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;
 	}
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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;
 	}

@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -21,7 +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 +35,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 = " ";

@@ -83,6 +71,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 +304,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 +315,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 +326,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 +346,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}
 	 *
@@ -454,17 +407,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 +436,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 +522,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 +542,5 @@ public class Criteria {
 		public Object getValue() {
 			return value;
 		}
-
-		@Override
-		public String toString() {
-			return "CriteriaEntry{" +
-					"key=" + key +
-					", value=" + value +
-					'}';
-		}
 	}
 }
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -1,11 +1,11 @@
 /*
- * 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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;
-	}
 }
@@ -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
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.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;
-	}
-}
@@ -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
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.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;
-	}
-}
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.elasticsearch.core.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;
-	}
-
-}
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -1,11 +1,11 @@
 /*
- * 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -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;
@@ -1,11 +1,11 @@
 /*
- * 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -15,15 +15,15 @@
 */
 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.highlight.HighlightBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;

-import java.util.Arrays;
+import java.util.ArrayList;
+import java.util.List;

 /**
 * NativeSearchQuery
@@ -35,31 +35,29 @@ 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<ScriptField>();
-	/*private List<FacetRequest> facets;*/
+	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;
@@ -70,7 +68,7 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
 		return query;
 	}

-	public QueryBuilder getFilter() {
+	public FilterBuilder getFilter() {
 		return filter;
 	}

@@ -83,18 +81,7 @@ 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) {
+	public void addFacet(FacetRequest facetRequest) {
 		if (facets == null) {
 			facets = new ArrayList<FacetRequest>();
 		}
@@ -108,7 +95,7 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
 	@Override
 	public List<FacetRequest> getFacets() {
 		return facets;
-	}*/
+	}

 	@Override
 	public List<AbstractAggregationBuilder> getAggregations() {
@@ -126,14 +113,4 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
 	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;
-	}
-
 }
@@ -1,11 +1,11 @@
 /*
- * 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -15,16 +15,19 @@
 */
 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.highlight.HighlightBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;

 /**
 * NativeSearchQuery
@@ -37,17 +40,15 @@ import org.springframework.data.domain.Pageable;
 public class NativeSearchQueryBuilder {

 	private QueryBuilder queryBuilder;
-	private QueryBuilder filterBuilder;
-    private List<ScriptField> scriptFields = new ArrayList<ScriptField>();
+	private FilterBuilder filterBuilder;
 	private List<SortBuilder> sortBuilders = new ArrayList<SortBuilder>();
+	private List<FacetRequest> facetRequests = new ArrayList<FacetRequest>();
 	private List<AbstractAggregationBuilder> aggregationBuilders = new ArrayList<AbstractAggregationBuilder>();
 	private HighlightBuilder.Field[] highlightFields;
 	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;
@@ -58,7 +59,7 @@ public class NativeSearchQueryBuilder {
 		return this;
 	}

-	public NativeSearchQueryBuilder withFilter(QueryBuilder filterBuilder) {
+	public NativeSearchQueryBuilder withFilter(FilterBuilder filterBuilder) {
 		this.filterBuilder = filterBuilder;
 		return this;
 	}
@@ -68,28 +69,18 @@ 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) {
+	public NativeSearchQueryBuilder withFacet(FacetRequest facetRequest) {
 		facetRequests.add(facetRequest);
 		return this;
-	}*/
-
-	public NativeSearchQueryBuilder withHighlightFields(HighlightBuilder.Field... highlightFields) {
-		this.highlightFields = highlightFields;
-		return this;
 	}

-	public NativeSearchQueryBuilder withIndicesBoost(List<IndexBoost> indicesBoost) {
-		this.indicesBoost = indicesBoost;
+	public NativeSearchQueryBuilder withHighlightFields(HighlightBuilder.Field... highlightFields) {
+		this.highlightFields = highlightFields;
 		return this;
 	}

@@ -113,11 +104,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;
@@ -156,19 +142,11 @@ public class NativeSearchQueryBuilder {
 			nativeSearchQuery.addFields(fields);
 		}

-		if (sourceFilter != null) {
-			nativeSearchQuery.addSourceFilter(sourceFilter);
+		if (CollectionUtils.isNotEmpty(facetRequests)) {
+			nativeSearchQuery.setFacets(facetRequests);
 		}
-		
-		if(indicesBoost != null) {
-		    nativeSearchQuery.setIndicesBoost(indicesBoost);
-		}
-		
-        if (!isEmpty(scriptFields)) {
-            nativeSearchQuery.setScriptFields(scriptFields);
-        }

-		if (!isEmpty(aggregationBuilders)) {
+		if (CollectionUtils.isNotEmpty(aggregationBuilders)) {
 			nativeSearchQuery.setAggregations(aggregationBuilders);
 		}

@@ -1,11 +1,11 @@
 /*
- * 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -111,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
 	 *
@@ -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;
-	}
-}
@@ -1,11 +1,11 @@
 /*
- * 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.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -17,10 +17,12 @@ 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.highlight.HighlightBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;

 /**
 * NativeSearchQuery
@@ -33,18 +35,13 @@ public interface SearchQuery extends Query {

 	QueryBuilder getQuery();

-	QueryBuilder getFilter();
+	FilterBuilder getFilter();

 	List<SortBuilder> getElasticsearchSorts();

-	/*List<FacetRequest> getFacets();*/
+	List<FacetRequest> getFacets();

 	List<AbstractAggregationBuilder> getAggregations();

 	HighlightBuilder.Field[] getHighlightFields();
-
-	List<IndexBoost> getIndicesBoost();
-
-    List<ScriptField> getScriptFields();
-
 }
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
@@ -5,7 +5,7 @@
 * you may not use this file except in compliance with the License.
 * You may obtain a copy of the License at
 *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      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,
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Oliver Gierke	8d0ad68d9a	DATAES-202 - After release cleanups.	2015-10-14 14:17:07 +02:00
Spring Buildmaster	52b6d050a5	DATAES-202 - Prepare next development iteration.	2015-10-14 03:29:32 -07:00
Spring Buildmaster	801d282542	DATAES-202 - Release version 1.1.4.RELEASE (Evans SR4).	2015-10-14 03:29:30 -07:00
Oliver Gierke	6389641d8d	DATAES-202 - Prepare 1.1.4.RELEASE (Evans SR4).	2015-10-14 11:25:07 +02:00
Oliver Gierke	b61c179013	DATAES-202 - Updated changelog.	2015-10-14 11:25:03 +02:00
Oliver Gierke	a5a6cebbdd	DATAES-193 - Updated changelog.	2015-10-14 09:18:27 +02:00
Oliver Gierke	8ec30dfff5	DATAES-186 - Updated changelog.	2015-10-14 09:18:11 +02:00
Oliver Gierke	caf2f1910a	DATAES-184 - Updated changelog.	2015-10-14 09:18:00 +02:00
Oliver Gierke	7dc975ed88	DATAES-173 - Updated changelog.	2015-10-14 09:17:49 +02:00
Oliver Gierke	2d330adb5f	DATAES-174 - After release cleanups.	2015-07-01 01:41:47 +02:00
Spring Buildmaster	975cba86aa	DATAES-174 - Prepare next development iteration.	2015-06-30 15:49:27 -07:00
Spring Buildmaster	0cbb7cd172	DATAES-174 - Release version 1.1.3.RELEASE (Evans SR3).	2015-06-30 15:49:25 -07:00
Oliver Gierke	3bb84212ae	DATAES-174 - Prepare 1.1.3.RELEASE (Evans SR3).	2015-07-01 00:12:29 +02:00
Oliver Gierke	87c356b458	DATAES-174 - Updated changelog.	2015-07-01 00:12:21 +02:00
Oliver Gierke	3e888bd08d	DATAES-175 - Updated changelog.	2015-06-30 14:22:26 +02:00
Oliver Gierke	e5c7acf4f0	DATAES-168 - Updated changelog.	2015-06-30 14:22:18 +02:00
Oliver Gierke	49848c7402	DATAES-154 - Updated changelog.	2015-06-30 14:22:08 +02:00
Oliver Gierke	3f9fb01ace	DATAES-152 - Updated changelog.	2015-03-06 08:18:43 +01:00
Artur Konczak	7ec291d572	DATAES-136 - BACKPORT from master- added support for basePackage configuration for @EnableElasticsearchRepositories - (cherry picked from commit `fad9a56`)	2015-02-14 20:31:16 +00:00
Oliver Gierke	0aab5f940f	DATAES-146 - After release cleanups.	2015-01-28 17:35:17 +01:00
Spring Buildmaster	eedcd8685f	DATAES-146 - Prepare next development iteration.	2015-01-28 03:47:57 -08:00
Spring Buildmaster	64d03e82fd	DATAES-146 - Release 1.1.2.RELEASE (Evans SR2).	2015-01-28 03:47:55 -08:00
Oliver Gierke	e07288e6e1	DATAES-146 - Prepare 1.1.2.RELEASE (Evans SR2).	2015-01-28 11:59:25 +01:00
Oliver Gierke	0d15936e7c	DATAES-146 - Updated changelog.	2015-01-28 11:24:01 +01:00
Oliver Gierke	6f60464035	DATAES-145 - Updated changelog.	2015-01-28 10:10:09 +01:00
Oliver Gierke	584dba0b23	DATAES-134 - Updated changelog.	2015-01-20 07:57:54 +01:00
Oliver Gierke	d41a925779	DATAES-133 - After release cleanups.	2014-10-31 21:34:46 +01:00
Spring Buildmaster	28e3a8c7fb	DATAES-133 - Prepare next development iteration.	2014-10-30 04:52:07 -07:00
Spring Buildmaster	d4fed726fa	DATAES-133 - Release version 1.1.1.RELEASE (Evans SR1).	2014-10-30 04:52:05 -07:00
Oliver Gierke	45495603d9	DATAES-133 - Prepare 1.1.1.RELEASE (Evans SR1).	2014-10-30 11:57:48 +01:00
Oliver Gierke	f5bee25fc6	DATAES-133 - Updated changelog.	2014-10-30 11:57:39 +01:00
Oliver Gierke	1af59690eb	DATAES-128 - After release cleanups.	2014-09-05 14:00:04 +02:00
Spring Buildmaster	5e658a8069	DATAES-128 - Prepare next development iteration.	2014-09-05 13:59:58 +02:00