DATAES-392 - Release version 3.0 GA (Kay).

Fix line endings.

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,9 +1,12 @@
+<!--
+
 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).

.gitignore

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

README.md

@@ -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>x.y.z.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>x.y.z.BUILD-SNAPSHOT</version>
 </dependency>
 
 <repository>
@@ -52,15 +52,12 @@ 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    |
+|           3.0.0.RC2                 |      5.5.0    |
+|           3.0.0.M4                  |      5.4.0    |
+|           2.0.4.RELEASE             |      2.4.0    |
+|           2.0.0.RELEASE             |      2.2.0    |
 |           1.4.0.M1                  |      1.7.3    |
 |           1.3.0.RELEASE             |      1.5.2    |
 |           1.2.0.RELEASE             |      1.4.4    |
@@ -245,12 +242,12 @@ Using Transport Client
 
 Here are some ways for you to get involved in the community:
 
-* Get involved with the Spring community on the Spring Community Forums.  Please help out on the [forum](http://forum.springsource.org/forumdisplay.php?f=80) by responding to questions and joining the debate.
-* Create [JIRA](https://jira.springframework.org/browse/DATAES) tickets for bugs and new features and comment and vote on the ones that you are interested in.  
+* Get involved with the Spring community on Stack OverFlow.  Please help out on the [forum](https://stackoverflow.com/questions/tagged/spring-data-elasticsearch) by responding to questions and joining the debate.
+* Create [JIRA](https://jira.spring.io/browse/DATAES/) tickets for bugs and new features and comment and vote on the ones that you are interested in.  
 * Github is for social coding: if you want to write code, we encourage contributions through pull requests from [forks of this repository](http://help.github.com/forking/). If you want to contribute code this way, please reference a JIRA ticket as well covering the specific issue you are addressing.
 * Watch for upcoming articles on Spring by [subscribing](http://www.springsource.org/node/feed) to springframework.org
 
-Before we accept a non-trivial patch or pull request we will need you to sign the [contributor's agreement](https://support.springsource.com/spring_committer_signup).  Signing the contributor's agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do.  Active contributors might be asked to join the core team, and given the ability to merge pull requests.
+Before we accept a non-trivial patch or pull request we will need you to [sign the Contributor License Agreement](https://cla.pivotal.io/sign/spring). Signing the contributor’s agreement does not grant anyone commit rights to the main repository, but it does mean that we can accept your contributions, and you will get an author credit if we do. If you forget to do so, you'll be reminded when you submit a pull request. Active contributors might be asked to join the core team, and given the ability to merge pull requests.
 
 
 Code formatting for [Eclipse and Intellij](https://github.com/spring-projects/spring-data-build/tree/master/etc/ide)

pom.xml

@@ -4,13 +4,12 @@
 
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-elasticsearch</artifactId>
-    <version>2.0.0.RELEASE</version>
+    <version>3.0.0.RELEASE</version>
 
     <parent>
         <groupId>org.springframework.data.build</groupId>
         <artifactId>spring-data-parent</artifactId>
-        <version>1.8.0.RELEASE</version>
-        <relativePath>../spring-data-build/parent/pom.xml</relativePath>
+        <version>2.0.0.RELEASE</version>
     </parent>
 
     <name>Spring Data Elasticsearch</name>
@@ -18,14 +17,11 @@
     <url>https://github.com/spring-projects/spring-data-elasticsearch</url>
 
     <properties>
-
-        <dist.key>DATAES</dist.key>
-
         <commonscollections>3.2.1</commonscollections>
         <commonslang>2.6</commonslang>
-        <elasticsearch>2.2.0</elasticsearch>
-        <springdata.commons>1.12.0.RELEASE</springdata.commons>
-
+        <elasticsearch>5.5.0</elasticsearch>
+        <springdata.commons>2.0.0.RELEASE</springdata.commons>
+        <java-module-name>spring.data.elasticsearch</java-module-name>
     </properties>
 
     <dependencies>
@@ -75,6 +71,30 @@
             <version>${elasticsearch}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.elasticsearch.client</groupId>
+            <artifactId>transport</artifactId>
+            <version>${elasticsearch}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-logging</groupId>
+                    <artifactId>commons-logging</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>log4j-over-slf4j</artifactId>
+            <version>1.7.22</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.8.2</version>
+        </dependency>
+
         <!-- Jackson JSON Mapper -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -100,13 +120,19 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${spring}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>ch.qos.logback</groupId>
+                    <artifactId>logback-classic</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
+
         <dependency>
             <groupId>org.apache.openwebbeans.test</groupId>
             <artifactId>cditest-owb</artifactId>
-            <version>${webbeans}</version>
+            <version>1.2.8</version>
             <scope>test</scope>
             <exclusions>
                 <exclusion>
@@ -119,6 +145,15 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        
+        <!-- Upgrade xbean to 4.5 to prevent incompatibilities due to ASM versions -->
+        <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-asm5-shaded</artifactId>
+            <version>4.5</version>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
@@ -126,13 +161,23 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+      <!-- required by elasticsearch -->
+            <groupId>org.elasticsearch.plugin</groupId>
+            <artifactId>transport-netty4-client</artifactId>
+            <version>${elasticsearch}</version>
+            <!--<scope>test</scope>-->
+        </dependency>
+
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.4</version>
+            <version>${lombok}</version>
             <scope>test</scope>
         </dependency>
 
+
+
     </dependencies>
 
     <build>
@@ -198,12 +243,12 @@
 
     <ciManagement>
         <system>Bamboo</system>
-        <url>http://build.springsource.org/browse/SPRINGDATAES</url>
+        <url>https://build.spring.io/browse/SPRINGDATAES</url>
     </ciManagement>
 
     <issueManagement>
         <system>JIRA</system>
-        <url>https://jira.springsource.org/browse/DATAES</url>
+        <url>https://jira.spring.io/browse/DATAES</url>
     </issueManagement>
 
 </project>

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

@@ -32,8 +32,6 @@ public @interface CompletionField {
 
 	String analyzer() default "simple";
 
-	boolean payloads() default false;
-
 	boolean preserveSeparators() default true;
 
 	boolean preservePositionIncrements() default true;

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

@@ -38,7 +38,7 @@ public @interface Field {
 
 	FieldType type() default FieldType.Auto;
 
-	FieldIndex index() default FieldIndex.analyzed;
+	boolean index() default true;
 
 	DateFormat format() default DateFormat.none;
 
@@ -46,6 +46,8 @@ public @interface Field {
 
 	boolean store() default false;
 
+	boolean fielddata() default false;
+
 	String searchAnalyzer() default "";
 
 	String analyzer() default "";

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

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

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

@@ -25,8 +25,4 @@ import java.lang.annotation.*;
 @Documented
 public @interface GeoPointField {
 
-        boolean geoHashPrefix() default false;
-
-        String geoHashPrecision() default "0";
-
 }

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

@@ -31,10 +31,12 @@ public @interface InnerField {
 
 	FieldType type();
 
-	FieldIndex index() default FieldIndex.analyzed;
+	boolean index() default true;
 
 	boolean store() default false;
 
+	boolean fielddata() default false;
+
 	String searchAnalyzer() default "";
 
 	String indexAnalyzer() default "";

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

@@ -1,127 +1,144 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.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.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.FactoryBean;
-import org.springframework.beans.factory.InitializingBean;
-
-/**
- * NodeClientFactoryBean
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public class NodeClientFactoryBean implements FactoryBean<NodeClient>, InitializingBean, DisposableBean {
-
-	private static final Logger logger = LoggerFactory.getLogger(NodeClientFactoryBean.class);
-	private boolean local;
-	private boolean enableHttp;
-	private String clusterName;
-	private NodeClient nodeClient;
-	private String pathData;
-	private String pathHome;
-	private String pathConfiguration;
-
-	NodeClientFactoryBean() {
-	}
-
-	public NodeClientFactoryBean(boolean local) {
-		this.local = local;
-	}
-
-	@Override
-	public NodeClient getObject() throws Exception {
-		return nodeClient;
-	}
-
-	@Override
-	public Class<? extends Client> getObjectType() {
-		return NodeClient.class;
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		nodeClient = (NodeClient) 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();
-	}
-
-	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();
-	}
-
-	public void setLocal(boolean local) {
-		this.local = local;
-	}
-
-	public void setEnableHttp(boolean enableHttp) {
-		this.enableHttp = enableHttp;
-	}
-
-	public void setClusterName(String clusterName) {
-		this.clusterName = clusterName;
-	}
-
-	public void setPathData(String pathData) {
-		this.pathData = pathData;
-	}
-
-	public void setPathHome(String pathHome) {
-		this.pathHome = pathHome;
-	}
-
-	public void setPathConfiguration(String configuration) {
-		this.pathConfiguration = configuration;
-	}
-
-	@Override
-	public void destroy() throws Exception {
-		try {
-			logger.info("Closing elasticSearch  client");
-			if (nodeClient != null) {
-				nodeClient.close();
-			}
-		} catch (final Exception e) {
-			logger.error("Error closing ElasticSearch client: ", e);
-		}
-	}
-}
+/*
+ * Copyright 2015-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Collection;
+import org.apache.commons.lang.StringUtils;
+import org.elasticsearch.client.Client;
+import org.elasticsearch.client.node.NodeClient;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.node.InternalSettingsPreparer;
+import org.elasticsearch.node.Node;
+import org.elasticsearch.plugins.Plugin;
+import org.elasticsearch.transport.Netty4Plugin;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+import static java.util.Arrays.*;
+
+/**
+ * NodeClientFactoryBean
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public class NodeClientFactoryBean implements FactoryBean<Client>, InitializingBean, DisposableBean {
+
+	private static final Logger logger = LoggerFactory.getLogger(NodeClientFactoryBean.class);
+	private boolean local;
+	private boolean enableHttp;
+	private String clusterName;
+	private NodeClient nodeClient;
+	private String pathData;
+	private String pathHome;
+	private String pathConfiguration;
+
+	public static class TestNode extends Node {
+		public TestNode(Settings preparedSettings, Collection<Class<? extends Plugin>> classpathPlugins) {
+			super(InternalSettingsPreparer.prepareEnvironment(preparedSettings, null), classpathPlugins);
+		}
+	}
+
+	NodeClientFactoryBean() {
+	}
+
+	public NodeClientFactoryBean(boolean local) {
+		this.local = local;
+	}
+
+	@Override
+	public NodeClient getObject() throws Exception {
+		return nodeClient;
+	}
+
+	@Override
+	public Class<? extends Client> getObjectType() {
+		return NodeClient.class;
+	}
+
+	@Override
+	public boolean isSingleton() {
+		return true;
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+
+		nodeClient = (NodeClient) new TestNode(
+				Settings.builder().put(loadConfig())
+						.put("transport.type", "netty4")
+						.put("transport.type", "local")
+						.put("http.type", "netty4")
+						.put("path.home", this.pathHome)
+						.put("path.data", this.pathData)
+						.put("cluster.name", this.clusterName)
+						.put("node.max_local_storage_nodes", 100)
+						.put("script.inline", "true")
+						.build(), asList(Netty4Plugin.class)).start().client();
+	}
+
+	private Settings loadConfig() throws IOException {
+		if (StringUtils.isNotBlank(pathConfiguration)) {
+			InputStream stream = getClass().getClassLoader().getResourceAsStream(pathConfiguration);
+			if (stream != null) {
+				return Settings.builder().loadFromStream(pathConfiguration, getClass().getClassLoader().getResourceAsStream(pathConfiguration)).build();
+			}
+			logger.error(String.format("Unable to read node configuration from file [%s]", pathConfiguration));
+		}
+		return Settings.builder().build();
+	}
+
+	public void setLocal(boolean local) {
+		this.local = local;
+	}
+
+	public void setEnableHttp(boolean enableHttp) {
+		this.enableHttp = enableHttp;
+	}
+
+	public void setClusterName(String clusterName) {
+		this.clusterName = clusterName;
+	}
+
+	public void setPathData(String pathData) {
+		this.pathData = pathData;
+	}
+
+	public void setPathHome(String pathHome) {
+		this.pathHome = pathHome;
+	}
+
+	public void setPathConfiguration(String configuration) {
+		this.pathConfiguration = configuration;
+	}
+
+	@Override
+	public void destroy() throws Exception {
+		try {
+			logger.info("Closing elasticSearch  client");
+			if (nodeClient != null) {
+				nodeClient.close();
+			}
+		} catch (final Exception e) {
+			logger.error("Error closing ElasticSearch client: ", e);
+		}
+	}
+}

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

@@ -23,6 +23,7 @@ import java.util.Properties;
 import org.elasticsearch.client.transport.TransportClient;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.transport.InetSocketTransportAddress;
+import org.elasticsearch.transport.client.PreBuiltTransportClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
@@ -86,7 +87,8 @@ public class TransportClientFactoryBean implements FactoryBean<TransportClient>,
 	}
 
 	protected void buildClient() throws Exception {
-		client = TransportClient.builder().settings(settings()).build();
+
+		client = new PreBuiltTransportClient(settings());
 		Assert.hasText(clusterNodes, "[Assertion failed] clusterNodes settings missing.");
 		for (String clusterNode : split(clusterNodes, COMMA)) {
 			String hostName = substringBeforeLast(clusterNode, COLON);

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

@@ -1,57 +1,57 @@
-/*
- * Copyright 2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.elasticsearch.config;
-
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.elasticsearch.client.NodeClientFactoryBean;
-import org.w3c.dom.Element;
-
-/**
- * NodeClientBeanDefinitionParser
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public class NodeClientBeanDefinitionParser extends AbstractBeanDefinitionParser {
-
-	@Override
-	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(NodeClientFactoryBean.class);
-		setLocalSettings(element, builder);
-		return getSourcedBeanDefinition(builder, element, parserContext);
-	}
-
-	private void setLocalSettings(Element element, BeanDefinitionBuilder builder) {
-		builder.addPropertyValue("local", Boolean.valueOf(element.getAttribute("local")));
-		builder.addPropertyValue("clusterName", element.getAttribute("cluster-name"));
-		builder.addPropertyValue("enableHttp", Boolean.valueOf(element.getAttribute("http-enabled")));
-		builder.addPropertyValue("pathData", element.getAttribute("path-data"));
-		builder.addPropertyValue("pathHome", element.getAttribute("path-home"));
-		builder.addPropertyValue("pathConfiguration", element.getAttribute("path-configuration"));
-	}
-
-	private AbstractBeanDefinition getSourcedBeanDefinition(BeanDefinitionBuilder builder, Element source,
-															ParserContext context) {
-		AbstractBeanDefinition definition = builder.getBeanDefinition();
-		definition.setSource(context.extractSource(source));
-		return definition;
-	}
-}
+/*
+ * Copyright 2015 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.elasticsearch.config;
+
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.elasticsearch.client.NodeClientFactoryBean;
+import org.w3c.dom.Element;
+
+/**
+ * NodeClientBeanDefinitionParser
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public class NodeClientBeanDefinitionParser extends AbstractBeanDefinitionParser {
+
+	@Override
+	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(NodeClientFactoryBean.class);
+		setLocalSettings(element, builder);
+		return getSourcedBeanDefinition(builder, element, parserContext);
+	}
+
+	private void setLocalSettings(Element element, BeanDefinitionBuilder builder) {
+		builder.addPropertyValue("local", Boolean.valueOf(element.getAttribute("local")));
+		builder.addPropertyValue("clusterName", element.getAttribute("cluster-name"));
+		builder.addPropertyValue("enableHttp", Boolean.valueOf(element.getAttribute("http-enabled")));
+		builder.addPropertyValue("pathData", element.getAttribute("path-data"));
+		builder.addPropertyValue("pathHome", element.getAttribute("path-home"));
+		builder.addPropertyValue("pathConfiguration", element.getAttribute("path-configuration"));
+	}
+
+	private AbstractBeanDefinition getSourcedBeanDefinition(BeanDefinitionBuilder builder, Element source,
+															ParserContext context) {
+		AbstractBeanDefinition definition = builder.getBeanDefinition();
+		definition.setSource(context.extractSource(source));
+		return definition;
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,7 +45,7 @@ class CriteriaFilterProcessor {
 
 
 	QueryBuilder createFilterFromCriteria(Criteria criteria) {
-		List<QueryBuilder> fbList = new LinkedList<QueryBuilder>();
+		List<QueryBuilder> fbList = new LinkedList<>();
 		QueryBuilder filter = null;
 
 		ListIterator<Criteria> chainIterator = criteria.getCriteriaChain().listIterator();
@@ -86,7 +86,7 @@ class CriteriaFilterProcessor {
 
 	private List<QueryBuilder> createFilterFragmentForCriteria(Criteria chainedCriteria) {
 		Iterator<Criteria.CriteriaEntry> it = chainedCriteria.getFilterCriteriaEntries().iterator();
-		List<QueryBuilder> filterList = new LinkedList<QueryBuilder>();
+		List<QueryBuilder> filterList = new LinkedList<>();
 
 		String fieldName = chainedCriteria.getField().getName();
 		Assert.notNull(fieldName, "Unknown field");
@@ -116,8 +116,8 @@ class CriteriaFilterProcessor {
 				Object[] valArray = (Object[]) value;
 				Assert.noNullElements(valArray, "Geo distance filter takes 2 not null elements array as parameter.");
 				Assert.isTrue(valArray.length == 2, "Geo distance filter takes a 2-elements array as parameter.");
-				Assert.isTrue(valArray[0] instanceof GeoPoint || valArray[0] instanceof String || valArray[0] instanceof Point, "First element of a geo distance filter must be a GeoPoint, a Point or a String");
-				Assert.isTrue(valArray[1] instanceof String || valArray[1] instanceof Distance, "Second element of a geo distance filter must be a String or a Distance");
+				Assert.isTrue(valArray[0] instanceof GeoPoint || valArray[0] instanceof String || valArray[0] instanceof Point, "First element of a geo distance filter must be a GeoPoint, a Point or a text");
+				Assert.isTrue(valArray[1] instanceof String || valArray[1] instanceof Distance, "Second element of a geo distance filter must be a text or a Distance");
 
 				StringBuilder dist = new StringBuilder();
 
@@ -129,15 +129,15 @@ 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);
+					geoDistanceQueryBuilder.point(loc.getLat(),loc.getLon()).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
 				} else if (valArray[0] instanceof Point) {
 					GeoPoint loc = GeoPoint.fromPoint((Point) valArray[0]);
-					geoDistanceQueryBuilder.lat(loc.getLat()).lon(loc.getLon()).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
+					geoDistanceQueryBuilder.point(loc.getLat(), loc.getLon()).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
 				} 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);
+						geoDistanceQueryBuilder.point(Double.parseDouble(c[0]), Double.parseDouble(c[1])).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
 					} else {
 						geoDistanceQueryBuilder.geohash(loc).distance(dist.toString()).geoDistance(GeoDistance.PLANE);
 					}
@@ -159,7 +159,7 @@ class CriteriaFilterProcessor {
 					oneParameterBBox((GeoBoundingBoxQueryBuilder) filter, valArray[0]);
 				} else if (valArray.length == 2) {
 					//2x GeoPoint
-					//2x String
+					//2x text
 					twoParameterBBox((GeoBoundingBoxQueryBuilder) filter, valArray);
 				} else {
 					//error
@@ -206,8 +206,7 @@ class CriteriaFilterProcessor {
 			geoBBox = (GeoBox) value;
 		}
 
-		filter.topLeft(geoBBox.getTopLeft().getLat(), geoBBox.getTopLeft().getLon());
-		filter.bottomRight(geoBBox.getBottomRight().getLat(), geoBBox.getBottomRight().getLon());
+		filter.setCorners(geoBBox.getTopLeft().getLat(), geoBBox.getTopLeft().getLon(), geoBBox.getBottomRight().getLat(), geoBBox.getBottomRight().getLon());
 	}
 
 	private static boolean isType(Object[] array, Class clazz) {
@@ -220,22 +219,20 @@ class CriteriaFilterProcessor {
 	}
 
 	private void twoParameterBBox(GeoBoundingBoxQueryBuilder filter, Object[] values) {
-		Assert.isTrue(isType(values, GeoPoint.class) || isType(values, String.class), " both elements of boundedBy filter must be type of GeoPoint or String(format lat,lon or geohash)");
+		Assert.isTrue(isType(values, GeoPoint.class) || isType(values, String.class), " both elements of boundedBy filter must be type of GeoPoint or text(format lat,lon or geohash)");
 		if (values[0] instanceof GeoPoint) {
 			GeoPoint topLeft = (GeoPoint) values[0];
 			GeoPoint bottomRight = (GeoPoint) values[1];
-			filter.topLeft(topLeft.getLat(), topLeft.getLon());
-			filter.bottomRight(bottomRight.getLat(), bottomRight.getLon());
+			filter.setCorners(topLeft.getLat(), topLeft.getLon(), bottomRight.getLat(), bottomRight.getLon());
 		} else {
 			String topLeft = (String) values[0];
 			String bottomRight = (String) values[1];
-			filter.topLeft(topLeft);
-			filter.bottomRight(bottomRight);
+			filter.setCorners(topLeft, bottomRight);
 		}
 	}
 
 	private List<QueryBuilder> buildNegationFilter(String fieldName, Iterator<Criteria.CriteriaEntry> it) {
-		List<QueryBuilder> notFilterList = new LinkedList<QueryBuilder>();
+		List<QueryBuilder> notFilterList = new LinkedList<>();
 
 		while (it.hasNext()) {
 			Criteria.CriteriaEntry criteriaEntry = it.next();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package org.springframework.data.elasticsearch.core;
 
+import static org.elasticsearch.index.query.Operator.AND;
 import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.springframework.data.elasticsearch.core.query.Criteria.*;
 
@@ -24,10 +25,7 @@ import java.util.List;
 import java.util.ListIterator;
 
 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.elasticsearch.index.query.*;
 import org.springframework.data.elasticsearch.core.query.Criteria;
 import org.springframework.util.Assert;
 
@@ -46,9 +44,9 @@ class CriteriaQueryProcessor {
 		if (criteria == null)
 			return null;
 
-		List<QueryBuilder> shouldQueryBuilderList = new LinkedList<QueryBuilder>();
-		List<QueryBuilder> mustNotQueryBuilderList = new LinkedList<QueryBuilder>();
-		List<QueryBuilder> mustQueryBuilderList = new LinkedList<QueryBuilder>();
+		List<QueryBuilder> shouldQueryBuilderList = new LinkedList<>();
+		List<QueryBuilder> mustNotQueryBuilderList = new LinkedList<>();
+		List<QueryBuilder> mustQueryBuilderList = new LinkedList<>();
 
 		ListIterator<Criteria> chainIterator = criteria.getCriteriaChain().listIterator();
 
@@ -148,7 +146,7 @@ class CriteriaQueryProcessor {
 
 		switch (key) {
 			case EQUALS:
-				query = queryStringQuery(searchText).field(fieldName).defaultOperator(QueryStringQueryBuilder.Operator.AND);
+				query = queryStringQuery(searchText).field(fieldName).defaultOperator(AND);
 				break;
 			case CONTAINS:
 				query = queryStringQuery("*" + searchText + "*").field(fieldName).analyzeWildcard(true);
@@ -203,8 +201,6 @@ class CriteriaQueryProcessor {
 		if (Float.isNaN(boost)) {
 			return;
 		}
-		if (query instanceof BoostableQueryBuilder) {
-			((BoostableQueryBuilder) query).boost(boost);
-		}
+		query.boost(boost);
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,8 @@
  */
 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;
@@ -30,24 +28,28 @@ 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.search.SearchHit;
 import org.elasticsearch.search.SearchHitField;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.elasticsearch.ElasticsearchException;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.ScriptedField;
+import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
+import org.springframework.data.elasticsearch.core.aggregation.impl.AggregatedPageImpl;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
-import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.context.MappingContext;
 
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
+
 /**
  * @author Artur Konczak
+ * @author Petar Tahchiev
+ * @author Young Gu
+ * @author Oliver Gierke
+ * @author Mark Paluch
  */
 public class DefaultResultMapper extends AbstractResultMapper {
 
@@ -74,9 +76,9 @@ public class DefaultResultMapper extends AbstractResultMapper {
 	}
 
 	@Override
-	public <T> Page<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
+	public <T> AggregatedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
 		long totalHits = response.getHits().totalHits();
-		List<T> results = new ArrayList<T>();
+		List<T> results = new ArrayList<>();
 		for (SearchHit hit : response.getHits()) {
 			if (hit != null) {
 				T result = null;
@@ -86,38 +88,38 @@ public class DefaultResultMapper extends AbstractResultMapper {
 					result = mapEntity(hit.getFields().values(), clazz);
 				}
 				setPersistentEntityId(result, hit.getId(), clazz);
-                populateScriptFields(result, hit);
+				populateScriptFields(result, hit);
 				results.add(result);
 			}
 		}
-		return new PageImpl<T>(results, pageable, totalHits);
+
+        return new AggregatedPageImpl<T>(results, pageable, totalHits, response.getAggregations(), response.getScrollId());
 	}
 
-    private <T> void populateScriptFields(T result, SearchHit hit) {
-        if (hit.getFields() != null && !hit.getFields().isEmpty() && result != null) {
-            for (java.lang.reflect.Field field : result.getClass().getDeclaredFields()) {
-                ScriptedField scriptedField = field.getAnnotation(ScriptedField.class);
-                if (scriptedField != null) {
-                    String name = scriptedField.name().isEmpty() ? field.getName() : scriptedField.name();
-                    SearchHitField searchHitField = hit.getFields().get(name);
-                    if (searchHitField != null) {
-                        field.setAccessible(true);
-                        try {
-                            field.set(result, searchHitField.getValue());
-                        } catch (IllegalArgumentException e) {
-                            throw new ElasticsearchException("failed to set scripted field: " + name + " with value: "
-                                    + searchHitField.getValue(), e);
-                        } catch (IllegalAccessException e) {
-                            throw new ElasticsearchException("failed to access scripted field: " + name, e);
-                        }
-                    }
-                }
-            }
-        }
-    }
+	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);
 	}
 
@@ -157,7 +159,7 @@ public class DefaultResultMapper extends AbstractResultMapper {
 
 	@Override
 	public <T> LinkedList<T> mapResults(MultiGetResponse responses, Class<T> clazz) {
-		LinkedList<T> list = new LinkedList<T>();
+		LinkedList<T> list = new LinkedList<>();
 		for (MultiGetItemResponse response : responses.getResponses()) {
 			if (!response.isFailed() && response.getResponse().isExists()) {
 				T result = mapEntity(response.getResponse().getSourceAsString(), clazz);
@@ -169,19 +171,17 @@ public class DefaultResultMapper extends AbstractResultMapper {
 	}
 
 	private <T> void setPersistentEntityId(T result, String id, Class<T> clazz) {
+
 		if (mappingContext != null && clazz.isAnnotationPresent(Document.class)) {
-			PersistentProperty<ElasticsearchPersistentProperty> idProperty = mappingContext.getPersistentEntity(clazz).getIdProperty();
+
+			ElasticsearchPersistentEntity<?> persistentEntity = mappingContext.getRequiredPersistentEntity(clazz);
+			ElasticsearchPersistentProperty idProperty = persistentEntity.getIdProperty();
+
 			// Only deal with String because ES generated Ids are strings !
 			if (idProperty != null && idProperty.getType().isAssignableFrom(String.class)) {
-				Method setter = idProperty.getSetter();
-				if (setter != null) {
-					try {
-						setter.invoke(result, id);
-					} catch (Throwable t) {
-						t.printStackTrace();
-					}
-				}
+				persistentEntity.getPropertyAccessor(result).setProperty(idProperty, id);
 			}
+
 		}
 	}
 }

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

@@ -18,6 +18,7 @@ package org.springframework.data.elasticsearch.core;
 import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.cluster.metadata.AliasMetaData;
+import org.elasticsearch.common.Nullable;
 import org.springframework.data.domain.Page;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
@@ -480,79 +481,52 @@ public interface ElasticsearchOperations {
 	<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);
-
-	/**
-	 * Returns scroll id for scan query
+	 * Returns scrolled page for given query
 	 *
 	 * @param query The search query.
 	 * @param scrollTimeInMillis The time in millisecond for scroll feature
 	 * {@link org.elasticsearch.action.search.SearchRequestBuilder#setScroll(org.elasticsearch.common.unit.TimeValue)}.
-	 * @param noFields The no fields support
-	 * {@link org.elasticsearch.action.search.SearchRequestBuilder#setNoFields()}.
+	 * @param clazz The class of entity to retrieve.
 	 * @return The scan id for input query.
 	 */
-	String scan(SearchQuery query, long scrollTimeInMillis, boolean noFields);
+	<T> Page<T> startScroll(long scrollTimeInMillis, SearchQuery query, Class<T> clazz);
 
 	/**
-	 * Returns scroll id for scan query
+	 * Returns scrolled page for given query
 	 *
 	 * @param query The search query.
 	 * @param scrollTimeInMillis The time in millisecond for scroll feature
 	 * {@link org.elasticsearch.action.search.SearchRequestBuilder#setScroll(org.elasticsearch.common.unit.TimeValue)}.
-	 * @param 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.
+	 * @param mapper Custom impl to map result to entities
 	 * @return The scan id for input query.
 	 */
-	<T> String scan(SearchQuery query, long scrollTimeInMillis, boolean noFields, Class<T> clazz);
+	<T> Page<T> startScroll(long scrollTimeInMillis, SearchQuery query, Class<T> clazz, SearchResultMapper mapper);
 
 	/**
-	 * Scrolls the results for give scroll id
+	 * Returns scrolled page for given query
 	 *
-	 * @param scrollId
-	 * @param scrollTimeInMillis
-	 * @param clazz
-	 * @param <T>
-	 * @return
+	 * @param criteriaQuery The search query.
+	 * @param scrollTimeInMillis The time in millisecond for scroll feature
+	 * {@link org.elasticsearch.action.search.SearchRequestBuilder#setScroll(org.elasticsearch.common.unit.TimeValue)}.
+	 * @param clazz The class of entity to retrieve.
+	 * @return The scan id for input query.
 	 */
-	<T> Page<T> scroll(String scrollId, long scrollTimeInMillis, Class<T> clazz);
+	<T> Page<T> startScroll(long scrollTimeInMillis, CriteriaQuery criteriaQuery, Class<T> clazz);
 
 	/**
-	 * Scrolls the results for give scroll id using custom result mapper
+	 * Returns scrolled page for given query
 	 *
-	 * @param scrollId
-	 * @param scrollTimeInMillis
-	 * @param mapper
-	 * @param <T>
-	 * @return
+	 * @param criteriaQuery The search query.
+	 * @param scrollTimeInMillis The time in millisecond for scroll feature
+	 * {@link org.elasticsearch.action.search.SearchRequestBuilder#setScroll(org.elasticsearch.common.unit.TimeValue)}.
+	 * @param mapper Custom impl to map result to entities
+	 * @return The scan id for input query.
 	 */
-	<T> Page<T> scroll(String scrollId, long scrollTimeInMillis, SearchResultMapper mapper);
+	<T> Page<T> startScroll(long scrollTimeInMillis, CriteriaQuery criteriaQuery, Class<T> clazz, SearchResultMapper mapper);
 
+
+	<T> Page<T> continueScroll(@Nullable String scrollId, long scrollTimeInMillis, Class<T> clazz);
+	<T> Page<T> continueScroll(@Nullable String scrollId, long scrollTimeInMillis, Class<T> clazz, SearchResultMapper mapper);
 	/**
 	 * Clears the search contexts associated with specified scroll ids.
 	 *

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

@@ -0,0 +1,37 @@
+/*
+ * 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
+ */
+@Deprecated
+public interface FacetedPage<T> extends Page<T> {
+
+	boolean hasFacets();
+
+	List<FacetResult> getFacets();
+
+	FacetResult getFacet(String name);
+}

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

@@ -0,0 +1,165 @@
+/*
+ * Copyright 2014-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.elasticsearch.search.aggregations.Aggregation;
+import org.elasticsearch.search.aggregations.Aggregations;
+import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
+import org.elasticsearch.search.aggregations.bucket.range.Range;
+import org.elasticsearch.search.aggregations.bucket.terms.Terms;
+import org.elasticsearch.search.aggregations.metrics.stats.extended.ExtendedStats;
+import org.elasticsearch.search.aggregations.metrics.sum.Sum;
+import org.joda.time.DateTime;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
+import org.springframework.data.elasticsearch.core.facet.AbstractFacetRequest;
+import org.springframework.data.elasticsearch.core.facet.FacetResult;
+import org.springframework.data.elasticsearch.core.facet.request.RangeFacetRequest;
+import org.springframework.data.elasticsearch.core.facet.result.HistogramResult;
+import org.springframework.data.elasticsearch.core.facet.result.IntervalUnit;
+import org.springframework.data.elasticsearch.core.facet.result.RangeResult;
+import org.springframework.data.elasticsearch.core.facet.result.StatisticalResult;
+import org.springframework.data.elasticsearch.core.facet.result.Term;
+import org.springframework.data.elasticsearch.core.facet.result.TermResult;
+
+/**
+ * Container for query result and facet results
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ * @author Jonathan Yan
+ * @author Philipp Kräutli
+ */
+@Deprecated
+public abstract class FacetedPageImpl<T> extends PageImpl<T> implements FacetedPage<T>, AggregatedPage<T> {
+
+	private List<FacetResult> facets;
+	private Map<String, FacetResult> mapOfFacets = new HashMap<>();
+
+	public FacetedPageImpl(List<T> content) {
+		super(content);
+	}
+
+	public FacetedPageImpl(List<T> content, Pageable pageable, long total) {
+		super(content, Pageable.unpaged(), total);
+	}
+
+	@Override
+	public boolean hasFacets() {
+		processAggregations();
+		return facets != null && facets.size() > 0;
+	}
+
+	@Override
+	public List<FacetResult> getFacets() {
+		processAggregations();
+		return facets;
+	}
+
+	@Override
+	public FacetResult getFacet(String name) {
+		processAggregations();
+		return mapOfFacets.get(name);
+	}
+
+	private void addFacet(FacetResult facetResult) {
+		facets.add(facetResult);
+		mapOfFacets.put(facetResult.getName(), facetResult);
+	}
+
+	/**
+	 * Lazy conversion from aggregation to old facets
+	 */
+	private void processAggregations() {
+		if (facets != null) {
+			return;
+		}
+		facets = new ArrayList<>();
+		Aggregations aggregations = getAggregations();
+		if (aggregations == null) {
+			return;
+		}
+		for (Aggregation agg : aggregations) {
+			processAggregation(agg);
+		}
+	}
+
+	private void processAggregation(Aggregation agg)
+	{
+		if (agg instanceof Terms) {
+			processTermAggregation((Terms) agg);
+		}
+		if (agg instanceof Range) {
+			processRangeAggregation((Range) agg);
+		}
+		if (agg instanceof ExtendedStats) {
+			processExtendedStatsAggregation((ExtendedStats) agg);
+		}
+		if (agg instanceof Histogram) {
+			processHistogramAggregation((Histogram) agg);
+		}
+	}
+
+	private void processTermAggregation(Terms agg)
+	{
+		List<Term> terms = new ArrayList<>();
+		for (Terms.Bucket t : agg.getBuckets()) {
+			terms.add(new Term(t.getKeyAsString(), t.getDocCount()));
+		}
+		addFacet(new TermResult(agg.getName(), terms, terms.size(), agg.getSumOfOtherDocCounts(), 0));
+	}
+
+	private void processRangeAggregation(Range agg)
+	{
+		List<? extends Range.Bucket> buckets = ((Range) agg).getBuckets();
+		List<org.springframework.data.elasticsearch.core.facet.result.Range> ranges = new ArrayList<>();
+		for (Range.Bucket b : buckets) {
+			ExtendedStats rStats = b.getAggregations().get(AbstractFacetRequest.INTERNAL_STATS);
+			if (rStats != null) {
+				Sum sum = b.getAggregations().get(RangeFacetRequest.RANGE_INTERNAL_SUM);
+				ranges.add(new org.springframework.data.elasticsearch.core.facet.result.Range((Double) b.getFrom(), (Double) b.getTo(), b.getDocCount(), sum != null ? sum.getValue() : rStats.getSum(), rStats.getCount(), rStats.getMin(), rStats.getMax()));
+			} else {
+				ranges.add(new org.springframework.data.elasticsearch.core.facet.result.Range((Double) b.getFrom(), (Double) b.getTo(), b.getDocCount(), 0, 0, 0, 0));
+			}
+		}
+		addFacet(new RangeResult(agg.getName(), ranges));
+	}
+
+	private void processExtendedStatsAggregation(ExtendedStats agg)
+	{
+		addFacet(new StatisticalResult(agg.getName(), agg.getCount(), agg.getMax(), agg.getMin(), agg.getAvg(), agg.getStdDeviation(), agg.getSumOfSquares(), agg.getSum(), agg.getVariance()));
+	}
+
+	private void processHistogramAggregation(Histogram agg)
+	{
+		List<IntervalUnit> intervals = new ArrayList<>();
+		for (Histogram.Bucket h : agg.getBuckets()) {
+			ExtendedStats hStats = h.getAggregations().get(AbstractFacetRequest.INTERNAL_STATS);
+			if (hStats != null) {
+				intervals.add(new IntervalUnit(((DateTime) h.getKey()).getMillis(), h.getDocCount(), h.getDocCount(), hStats.getSum(), hStats.getAvg(), hStats.getMin(), hStats.getMax()));
+			} else {
+				intervals.add(new IntervalUnit(((DateTime) h.getKey()).getMillis(), h.getDocCount(), h.getDocCount(), 0, 0, 0, 0));
+			}
+		}
+		addFacet(new HistogramResult(agg.getName(), intervals));
+	}
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,28 +15,31 @@
  */
 package org.springframework.data.elasticsearch.core;
 
-import static org.apache.commons.lang.StringUtils.*;
-import static org.elasticsearch.common.xcontent.XContentFactory.*;
-import static org.springframework.util.StringUtils.*;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.math.NumberUtils;
 import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.springframework.core.GenericCollectionTypeResolver;
+import org.springframework.core.ResolvableType;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.annotation.Transient;
-import org.springframework.data.elasticsearch.annotations.*;
+import org.springframework.data.elasticsearch.annotations.CompletionField;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
+import org.springframework.data.elasticsearch.annotations.Field;
+import org.springframework.data.elasticsearch.annotations.FieldType;
+import org.springframework.data.elasticsearch.annotations.GeoPointField;
+import org.springframework.data.elasticsearch.annotations.InnerField;
+import org.springframework.data.elasticsearch.annotations.Mapping;
+import org.springframework.data.elasticsearch.annotations.MultiField;
 import org.springframework.data.elasticsearch.core.completion.Completion;
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
+import static org.apache.commons.lang.StringUtils.*;
+import static org.elasticsearch.common.xcontent.XContentFactory.*;
+import static org.springframework.util.StringUtils.*;
 
 /**
  * @author Rizwan Idrees
@@ -45,10 +48,12 @@ import org.springframework.data.util.TypeInformation;
  * @author Kevin Leturc
  * @author Alexander Volz
  * @author Dennis Maaß
+ * @author Pavel Luhin
+ * @author Mark Paluch
  */
-
 class MappingBuilder {
 
+	public static final String FIELD_DATA = "fielddata";
 	public static final String FIELD_STORE = "store";
 	public static final String FIELD_TYPE = "type";
 	public static final String FIELD_INDEX = "index";
@@ -58,19 +63,18 @@ class MappingBuilder {
 	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_STRING = "text";
 	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();
+	private static SimpleTypeHolder SIMPLE_TYPE_HOLDER = SimpleTypeHolder.DEFAULT;
 
 	static XContentBuilder buildMapping(Class clazz, String indexType, String idFieldName, String parentType) throws IOException {
 
@@ -108,7 +112,7 @@ class MappingBuilder {
 
 		for (java.lang.reflect.Field field : fields) {
 
-			if (field.isAnnotationPresent(Transient.class) || isInIgnoreFields(field)) {
+			if (field.isAnnotationPresent(Transient.class) || isInIgnoreFields(field, fieldAnnotation)) {
 				continue;
 			}
 
@@ -165,7 +169,7 @@ 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>();
+		List<java.lang.reflect.Field> fields = new ArrayList<>();
 
 		// Keep backing up the inheritance hierarchy.
 		Class targetClass = clazz;
@@ -188,21 +192,6 @@ class MappingBuilder {
 	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();
 	}
 
@@ -211,7 +200,6 @@ class MappingBuilder {
 		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())) {
@@ -243,6 +231,10 @@ class MappingBuilder {
 		if(!nestedOrObjectField) {
 			xContentBuilder.field(FIELD_STORE, fieldAnnotation.store());
 		}
+		if(fieldAnnotation.fielddata()) {
+			xContentBuilder.field(FIELD_DATA, fieldAnnotation.fielddata());
+		}
+
 		if (FieldType.Auto != fieldAnnotation.type()) {
 			xContentBuilder.field(FIELD_TYPE, fieldAnnotation.type().name().toLowerCase());
 			if (FieldType.Date == fieldAnnotation.type() && DateFormat.none != fieldAnnotation.format()) {
@@ -250,8 +242,8 @@ class MappingBuilder {
 						? fieldAnnotation.pattern() : fieldAnnotation.format());
 			}
 		}
-		if (FieldIndex.not_analyzed == fieldAnnotation.index() || FieldIndex.no == fieldAnnotation.index()) {
-			xContentBuilder.field(FIELD_INDEX, fieldAnnotation.index().name().toLowerCase());
+		if(!fieldAnnotation.index()) {
+			xContentBuilder.field(FIELD_INDEX, fieldAnnotation.index());
 		}
 		if (isNotBlank(fieldAnnotation.searchAnalyzer())) {
 			xContentBuilder.field(FIELD_SEARCH_ANALYZER, fieldAnnotation.searchAnalyzer());
@@ -274,8 +266,8 @@ class MappingBuilder {
 		if (FieldType.Auto != annotation.type()) {
 			builder.field(FIELD_TYPE, annotation.type().name().toLowerCase());
 		}
-		if (FieldIndex.not_analyzed == annotation.index()) {
-			builder.field(FIELD_INDEX, annotation.index().name().toLowerCase());
+		if(!annotation.index()) {
+			builder.field(FIELD_INDEX, annotation.index());
 		}
 		if (isNotBlank(annotation.searchAnalyzer())) {
 			builder.field(FIELD_SEARCH_ANALYZER, annotation.searchAnalyzer());
@@ -283,6 +275,9 @@ class MappingBuilder {
 		if (isNotBlank(annotation.indexAnalyzer())) {
 			builder.field(FIELD_INDEX_ANALYZER, annotation.indexAnalyzer());
 		}
+		if (annotation.fielddata()) {
+			builder.field(FIELD_DATA, annotation.fielddata());
+		}
 		builder.endObject();
 	}
 
@@ -294,10 +289,10 @@ class MappingBuilder {
 	private static void addMultiFieldMapping(XContentBuilder builder, java.lang.reflect.Field field,
 											 MultiField annotation, boolean nestedOrObjectField) throws IOException {
 		builder.startObject(field.getName());
-		builder.field(FIELD_TYPE, "multi_field");
+		builder.field(FIELD_TYPE, annotation.mainField().type());
 		builder.startObject("fields");
 		//add standard field
-		addSingleFieldMapping(builder, field, annotation.mainField(),nestedOrObjectField);
+		//addSingleFieldMapping(builder, field, annotation.mainField(), nestedOrObjectField);
 		for (InnerField innerField : annotation.otherFields()) {
 			addNestedFieldMapping(builder, field, innerField);
 		}
@@ -313,12 +308,20 @@ class MappingBuilder {
 	}
 
 	protected static Class<?> getFieldType(java.lang.reflect.Field field) {
-		Class<?> clazz = field.getType();
-		TypeInformation typeInformation = ClassTypeInformation.from(clazz);
-		if (typeInformation.isCollectionLike()) {
-			clazz = GenericCollectionTypeResolver.getCollectionFieldType(field) != null ? GenericCollectionTypeResolver.getCollectionFieldType(field) : typeInformation.getComponentType().getType();
+
+		ResolvableType resolvableType = ResolvableType.forField(field);
+
+		if (resolvableType.isArray()) {
+			return resolvableType.getComponentType().getRawClass();
 		}
-		return clazz;
+
+		ResolvableType componentType = resolvableType.getGeneric(0);
+		if (Iterable.class.isAssignableFrom(field.getType())
+				&& componentType != ResolvableType.NONE) {
+			return componentType.getRawClass();
+		}
+
+		return resolvableType.getRawClass();
 	}
 
 	private static boolean isAnyPropertyAnnotatedAsField(java.lang.reflect.Field[] fields) {
@@ -336,10 +339,9 @@ class MappingBuilder {
 		return idFieldName.equals(field.getName());
 	}
 
-	private static boolean isInIgnoreFields(java.lang.reflect.Field field) {
-		Field fieldAnnotation = field.getAnnotation(Field.class);
-		if (null != fieldAnnotation) {
-			String[] ignoreFields = fieldAnnotation.ignoreFields();
+	private static boolean isInIgnoreFields(java.lang.reflect.Field field, Field parentFieldAnnotation) {
+		if (null != parentFieldAnnotation) {
+			String[] ignoreFields = parentFieldAnnotation.ignoreFields();
 			return Arrays.asList(ignoreFields).contains(field.getName());
 		}
 		return false;

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

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

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

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

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

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

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

@@ -0,0 +1,97 @@
+/*
+ * Copyright 2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.aggregation.impl;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.elasticsearch.search.aggregations.Aggregation;
+import org.elasticsearch.search.aggregations.Aggregations;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.core.FacetedPageImpl;
+import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
+
+/**
+ * @author Petar Tahchiev
+ * @author Artur Konczak
+ * @author Mohsin Husen
+ */
+public class AggregatedPageImpl<T> extends FacetedPageImpl<T> implements AggregatedPage<T> {
+
+	private Aggregations aggregations;
+	private Map<String, Aggregation> mapOfAggregations = new HashMap<>();
+    private String scrollId;
+
+	public AggregatedPageImpl(List<T> content) {
+		super(content);
+	}
+
+	public AggregatedPageImpl(List<T> content, String scrollId) {
+		super(content);
+		this.scrollId = scrollId;
+	}
+
+	public AggregatedPageImpl(List<T> content, Pageable pageable, long total) {
+		super(content, pageable, total);
+	}
+
+	public AggregatedPageImpl(List<T> content, Pageable pageable, long total, String scrollId) {
+		super(content, pageable, total);
+		this.scrollId = scrollId;
+	}
+
+	public AggregatedPageImpl(List<T> content, Pageable pageable, long total, Aggregations aggregations) {
+		super(content, pageable, total);
+		this.aggregations = aggregations;
+		if (aggregations != null) {
+			for (Aggregation aggregation : aggregations) {
+				mapOfAggregations.put(aggregation.getName(), aggregation);
+			}
+		}
+	}
+
+	public AggregatedPageImpl(List<T> content, Pageable pageable, long total, Aggregations aggregations, String scrollId) {
+		super(content, pageable, total);
+		this.aggregations = aggregations;
+		this.scrollId = scrollId;
+		if (aggregations != null) {
+			for (Aggregation aggregation : aggregations) {
+				mapOfAggregations.put(aggregation.getName(), aggregation);
+			}
+		}
+	}
+
+	@Override
+	public boolean hasAggregations() {
+		return aggregations != null && mapOfAggregations.size() > 0;
+	}
+
+	@Override
+	public Aggregations getAggregations() {
+		return aggregations;
+	}
+
+	@Override
+	public Aggregation getAggregation(String name) {
+		return aggregations == null ? null : aggregations.get(name);
+	}
+
+	@Override
+	public String getScrollId() {
+		return scrollId;
+	}
+}

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

@@ -11,9 +11,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 public class Completion {
 
 	private String[] input;
-	private String output;
 	private Integer weight;
-	private Object payload;
 
 	private Completion() {
 		//required by mapper to instantiate object
@@ -31,22 +29,6 @@ public class Completion {
 		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;
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -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,7 +43,9 @@ public class MappingElasticsearchConverter implements ElasticsearchConverter, Ap
 
 	public MappingElasticsearchConverter(
 			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
-		Assert.notNull(mappingContext);
+		
+		Assert.notNull(mappingContext, "MappingContext must not be null!");
+		
 		this.mappingContext = mappingContext;
 		this.conversionService = new DefaultConversionService();
 	}

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

@@ -0,0 +1,50 @@
+/*
+ * 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
+ */
+@Deprecated
+public abstract class AbstractFacetRequest implements FacetRequest {
+
+	public static final String INTERNAL_STATS = "internal-stats";
+
+	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;
+	}
+}

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

@@ -0,0 +1,47 @@
+/*
+ * 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
+ */
+@Deprecated
+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;
+	}
+}

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

@@ -0,0 +1,33 @@
+/*
+ * 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.aggregations.AbstractAggregationBuilder;
+
+/**
+ * @author Artur Koczak
+ */
+@Deprecated
+public interface FacetRequest {
+
+	public static final String FIELD_UNTOUCHED = "untouched";
+	public static final String FIELD_SORT = "sort";
+
+	AbstractAggregationBuilder getFacet();
+
+	boolean applyQueryFilter();
+}

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

@@ -0,0 +1,32 @@
+/*
+ * 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;
+
+/**
+ * Generic interface for all facets
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ * @author Jonathan Yan
+ */
+@Deprecated
+public interface FacetResult {
+
+	String getName();
+
+	FacetType getType();
+}

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

@@ -0,0 +1,27 @@
+/*
+ * 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;
+
+/**
+ * @author Artur Konczak
+ * @author Petar Tahchiev
+ */
+@Deprecated
+public enum FacetType {
+
+	term, range, histogram, statistical
+
+}

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

@@ -0,0 +1,73 @@
+/*
+ * 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.StringUtils;
+import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
+import org.elasticsearch.search.aggregations.AggregationBuilders;
+import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
+import org.springframework.data.elasticsearch.core.facet.AbstractFacetRequest;
+import org.springframework.util.Assert;
+
+
+/**
+ * @author Artur Konczak
+ * @author Mohsin Husen
+ */
+@Deprecated
+public class HistogramFacetRequest extends AbstractFacetRequest {
+
+	private String field;
+	private long interval;
+	private DateHistogramInterval timeUnit;
+
+	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(DateHistogramInterval timeUnit) {
+		this.timeUnit = timeUnit;
+	}
+
+	public AbstractAggregationBuilder getFacet() {
+		Assert.notNull(getName(), "Facet name can't be a null !!!");
+		Assert.isTrue(StringUtils.isNotBlank(field), "Please select field on which to build the facet !!!");
+		Assert.isTrue(interval > 0, "Please provide interval as positive value greater them zero !!!");
+
+		DateHistogramAggregationBuilder dateHistogramBuilder = AggregationBuilders.dateHistogram(getName());
+		dateHistogramBuilder.field(field);
+
+		if (timeUnit != null) {
+			dateHistogramBuilder.dateHistogramInterval(timeUnit);
+		} else {
+			dateHistogramBuilder.interval(interval);
+		}
+
+		dateHistogramBuilder.subAggregation(AggregationBuilders.extendedStats(INTERNAL_STATS).field(field));
+
+		return dateHistogramBuilder;
+	}
+}

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

@@ -0,0 +1,58 @@
+/*
+ * 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.aggregations.bucket.histogram.DateHistogramInterval;
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
+
+
+/**
+ * @author Artur Konczak
+ */
+@Deprecated
+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(DateHistogramInterval timeUnit) {
+		result.setTimeUnit(timeUnit);
+		return this;
+	}
+
+	public FacetRequest build() {
+		return result;
+	}
+
+	public HistogramFacetRequestBuilder applyQueryFilter() {
+		result.setApplyQueryFilter(true);
+		return this;
+	}
+}

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

@@ -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.request;
+
+import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
+
+
+/**
+ * @author Artur Konczak
+ * @author Mohsin Husen
+ */
+@Deprecated
+public class NativeFacetRequest implements FacetRequest {
+
+	public NativeFacetRequest() {
+		throw new UnsupportedOperationException("Native Facet are not supported in Elasticsearch 2.x - use Aggregation");
+	}
+
+	@Override
+	public AbstractAggregationBuilder getFacet() {
+		return null;
+	}
+
+	@Override
+	public boolean applyQueryFilter() {
+		return false;
+	}
+}

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

@@ -0,0 +1,133 @@
+/*
+ * Copyright 2014-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.elasticsearch.core.facet.request;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
+import org.elasticsearch.search.aggregations.AggregationBuilders;
+import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.springframework.data.elasticsearch.core.facet.AbstractFacetRequest;
+import org.springframework.util.Assert;
+
+
+/**
+ * Range facet for numeric fields
+ *
+ * @author Artur Konczak
+ * @author Akos Bordas
+ */
+@Deprecated
+public class RangeFacetRequest extends AbstractFacetRequest {
+
+	public static final String RANGE_INTERNAL_SUM = "range-internal-sum";
+	private String field;
+	private String keyField;
+	private String valueField;
+
+	private List<Entry> entries = new ArrayList<>();
+
+	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) {
+		throw new UnsupportedOperationException("Native Facet are not supported in Elasticsearch 2.x - use Aggregation");
+	}
+
+	public void addRange(Double from, Double to) {
+		entries.add(new DoubleEntry(from, to));
+	}
+
+	public void addRange(String from, String to) {
+		throw new UnsupportedOperationException("Native Facet are not supported in Elasticsearch 2.x - use Aggregation");
+	}
+
+	@Override
+	public AbstractAggregationBuilder getFacet() {
+		Assert.notNull(getName(), "Facet name can't be a null !!!");
+
+		RangeAggregationBuilder rangeBuilder = AggregationBuilders.range(getName());
+		final String field = StringUtils.isNotBlank(keyField) ? keyField : this.field;
+		rangeBuilder.field(field);
+
+		for (Entry entry : entries) {
+			DoubleEntry doubleEntry = (DoubleEntry) entry;
+			rangeBuilder.addRange(validateValue(doubleEntry.getFrom(), Double.NEGATIVE_INFINITY), validateValue(doubleEntry.getTo(), Double.POSITIVE_INFINITY));
+		}
+
+		rangeBuilder.subAggregation(AggregationBuilders.extendedStats(INTERNAL_STATS).field(field));
+		if(StringUtils.isNotBlank(valueField)){
+			rangeBuilder.subAggregation(AggregationBuilders.sum(RANGE_INTERNAL_SUM).field(valueField));
+		}
+
+		return rangeBuilder;
+	}
+
+	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;
+		}
+	}
+}
+

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

@@ -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.request;
+
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
+
+
+/**
+ * Basic range facet
+ *
+ * @author Artur Konczak
+ */
+@Deprecated
+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;
+	}
+}

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

@@ -0,0 +1,53 @@
+/*
+ * 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.StringUtils;
+import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
+import org.elasticsearch.search.aggregations.AggregationBuilders;
+import org.springframework.data.elasticsearch.core.facet.AbstractFacetRequest;
+import org.springframework.util.Assert;
+
+
+/**
+ * @author Petar Tahchiev
+ */
+@Deprecated
+public class StatisticalFacetRequest extends AbstractFacetRequest {
+
+	private String field;
+
+	private String[] fields;
+
+	public StatisticalFacetRequest(String name) {
+		super(name);
+	}
+
+	public void setField(String field) {
+		this.field = field;
+	}
+
+	public void setFields(String... fields) {
+		throw new UnsupportedOperationException("Native Facet are not supported in Elasticsearch 2.x - use Aggregation");
+	}
+
+	public AbstractAggregationBuilder getFacet() {
+		Assert.notNull(getName(), "Facet name can't be a null !!!");
+		Assert.isTrue(StringUtils.isNotBlank(field) && fields == null, "Please select field or fields on which to build the facets !!!");
+		return AggregationBuilders.extendedStats(getName()).field(field);
+	}
+}

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

@@ -0,0 +1,52 @@
+/*
+ * 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
+ */
+@Deprecated
+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;
+	}
+}

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

@@ -0,0 +1,27 @@
+/*
+ * 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;
+
+/**
+ * @author Artur Konczak
+ * @author Mohsin Husen
+ */
+@Deprecated
+public enum TermFacetOrder {
+
+	ascTerm, descTerm, ascCount, descCount;
+
+}

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

@@ -0,0 +1,109 @@
+/*
+ * 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.apache.lucene.util.automaton.RegExp;
+import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
+import org.elasticsearch.search.aggregations.AggregationBuilders;
+import org.elasticsearch.search.aggregations.bucket.terms.Terms;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.terms.support.IncludeExclude;
+import org.springframework.data.elasticsearch.core.facet.AbstractFacetRequest;
+import org.springframework.util.Assert;
+
+
+/**
+ * Term facet
+ *
+ * @author Artur Konczak
+ */
+@Deprecated
+public class TermFacetRequest extends AbstractFacetRequest {
+
+	private String[] fields;
+	private String[] excludeTerms;
+	private int size = 10;
+	private TermFacetOrder order = TermFacetOrder.descCount;
+	private boolean allTerms = false;
+	private String regex = null;
+
+	public TermFacetRequest(String name) {
+		super(name);
+	}
+
+	public void setFields(String... fields) {
+		Assert.isTrue(ArrayUtils.isNotEmpty(fields), "Term agg need one field only");
+		Assert.isTrue(ArrayUtils.getLength(fields) == 1, "Term agg need one field only");
+		this.fields = fields;
+	}
+
+	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(String... excludeTerms) {
+		this.excludeTerms = excludeTerms;
+	}
+
+	public void setAllTerms(boolean allTerms) {
+		this.allTerms = allTerms;
+	}
+
+	public void setRegex(String regex) {
+		this.regex = regex;
+	}
+
+	@Override
+	public AbstractAggregationBuilder getFacet() {
+		Assert.notEmpty(fields, "Please select at last one field !!!");
+		final TermsAggregationBuilder termsBuilder = AggregationBuilders.terms(getName()).field(fields[0]).size(this.size);
+
+		switch (order) {
+			case descTerm:
+				termsBuilder.order(Terms.Order.term(false));
+				break;
+			case ascTerm:
+				termsBuilder.order(Terms.Order.term(true));
+				break;
+			case descCount:
+				termsBuilder.order(Terms.Order.count(false));
+				break;
+			default:
+				termsBuilder.order(Terms.Order.count(true));
+		}
+		if (ArrayUtils.isNotEmpty(excludeTerms)) {
+			termsBuilder.includeExclude(new IncludeExclude(null,excludeTerms));
+		}
+
+		if (allTerms) {
+			termsBuilder.size(Integer.MAX_VALUE);
+		}
+
+		if (StringUtils.isNotBlank(regex)) {
+			termsBuilder.includeExclude(new IncludeExclude(new RegExp(regex),null));
+		}
+
+		return termsBuilder;
+	}
+}

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

@@ -0,0 +1,88 @@
+/*
+ * 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
+ */
+@Deprecated
+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(String... 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 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;
+	}
+}

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

@@ -0,0 +1,39 @@
+/*
+ * 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
+ */
+@Deprecated
+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;
+	}
+}

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

@@ -0,0 +1,92 @@
+/*
+ * 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
+ */
+@Deprecated
+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 +
+				'}';
+	}
+}

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

@@ -0,0 +1,79 @@
+/*
+ * 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
+ */
+@Deprecated
+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;
+	}
+}

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

@@ -0,0 +1,44 @@
+/*
+ * 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
+ */
+@Deprecated
+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;
+	}
+}

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

@@ -0,0 +1,86 @@
+/*
+ * 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
+ */
+@Deprecated
+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;
+	}
+}

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

@@ -0,0 +1,44 @@
+/*
+ * 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 term
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ * @author Jonathan Yan
+ */
+@Deprecated
+public class Term {
+
+	private String term;
+	private long count;
+
+	public Term(String term, long count) {
+		this.term = term;
+		this.count = count;
+	}
+
+	public String getTerm() {
+		return term;
+	}
+
+	public long getCount() {
+		return count;
+	}
+}

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

@@ -0,0 +1,63 @@
+/*
+ * 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
+ * @author Matija Obreza
+ */
+@Deprecated
+public class TermResult extends AbstractFacetResult {
+
+	private List<Term> terms;
+	private long total;
+	private long other;
+	private long missing;
+
+	public TermResult(String name, List<Term> terms, long total, long other, long missing) {
+		super(name, FacetType.term);
+		this.terms = terms;
+		this.total = total;
+		this.other = other;
+		this.missing = missing;
+	}
+
+	public List<Term> getTerms() {
+		return terms;
+	}
+	
+	public long getTotal() {
+		return total;
+	}
+	
+	public long getOther() {
+		return other;
+	}
+	
+	public long getMissing() {
+		return missing;
+	}
+}

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

@@ -1,10 +1,8 @@
 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;
@@ -32,39 +30,15 @@ public class CustomGeoModule extends SimpleModule {
 }
 
 class PointSerializer extends JsonSerializer<Point> {
-
 	@Override
-	public void serialize(Point value, JsonGenerator gen, SerializerProvider serializers) throws IOException, JsonProcessingException {
+	public void serialize(Point value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
 		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);
+	public Point deserialize(JsonParser p, DeserializationContext context) throws IOException {
+		return GeoPoint.toPoint(p.readValueAs(GeoPoint.class));
 	}
 }

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

@@ -1,52 +1,52 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.mapping;
-
-import org.springframework.data.mapping.PersistentEntity;
-
-/**
- * ElasticsearchPersistentEntity
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public interface ElasticsearchPersistentEntity<T> extends PersistentEntity<T, ElasticsearchPersistentProperty> {
-
-	String getIndexName();
-
-	String getIndexType();
-
-	short getShards();
-
-	short getReplicas();
-
-	boolean isUseServerConfiguration();
-
-	String getRefreshInterval();
-
-	String getIndexStoreType();
-
-	ElasticsearchPersistentProperty getVersionProperty();
-
-	String getParentType();
-
-	ElasticsearchPersistentProperty getParentIdProperty();
-
-	String settingPath();
-
-	boolean isCreateIndexAndMapping();
-}
+/*
+ * Copyright 2013-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.mapping;
+
+import org.springframework.data.mapping.PersistentEntity;
+
+/**
+ * ElasticsearchPersistentEntity
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Mark Paluch
+ */
+public interface ElasticsearchPersistentEntity<T> extends PersistentEntity<T, ElasticsearchPersistentProperty> {
+
+	String getIndexName();
+
+	String getIndexType();
+
+	short getShards();
+
+	short getReplicas();
+
+	boolean isUseServerConfiguration();
+
+	String getRefreshInterval();
+
+	String getIndexStoreType();
+
+	ElasticsearchPersistentProperty getVersionProperty();
+
+	String getParentType();
+
+	ElasticsearchPersistentProperty getParentIdProperty();
+
+	String settingPath();
+
+	boolean isCreateIndexAndMapping();
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,11 @@
  */
 package org.springframework.data.elasticsearch.core.mapping;
 
-import java.beans.PropertyDescriptor;
-import java.lang.reflect.Field;
-
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.data.mapping.context.AbstractMappingContext;
+import org.springframework.data.mapping.model.Property;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 import org.springframework.data.util.TypeInformation;
 
@@ -30,8 +28,8 @@ import org.springframework.data.util.TypeInformation;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
+ * @author Mark Paluch
  */
-
 public class SimpleElasticsearchMappingContext extends
 		AbstractMappingContext<SimpleElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> implements ApplicationContextAware {
 
@@ -39,8 +37,8 @@ public class SimpleElasticsearchMappingContext extends
 
 	@Override
 	protected <T> SimpleElasticsearchPersistentEntity<?> createPersistentEntity(TypeInformation<T> typeInformation) {
-		final SimpleElasticsearchPersistentEntity<T> persistentEntity =
-				new SimpleElasticsearchPersistentEntity<T>(typeInformation);
+		final SimpleElasticsearchPersistentEntity<T> persistentEntity = new SimpleElasticsearchPersistentEntity<>(
+				typeInformation);
 		if (context != null) {
 			persistentEntity.setApplicationContext(context);
 		}
@@ -48,9 +46,9 @@ public class SimpleElasticsearchMappingContext extends
 	}
 
 	@Override
-	protected ElasticsearchPersistentProperty createPersistentProperty(Field field, PropertyDescriptor descriptor,
-																	   SimpleElasticsearchPersistentEntity<?> owner, SimpleTypeHolder simpleTypeHolder) {
-		return new SimpleElasticsearchPersistentProperty(field, descriptor, owner, simpleTypeHolder);
+	protected ElasticsearchPersistentProperty createPersistentProperty(Property property,
+			SimpleElasticsearchPersistentEntity<?> owner, SimpleTypeHolder simpleTypeHolder) {
+		return new SimpleElasticsearchPersistentProperty(property, owner, simpleTypeHolder);
 	}
 
 	@Override

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

@@ -1,170 +1,171 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.mapping;
-
-import static org.springframework.util.StringUtils.*;
-
-import java.util.Locale;
-
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.expression.BeanFactoryAccessor;
-import org.springframework.context.expression.BeanFactoryResolver;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Parent;
-import org.springframework.data.elasticsearch.annotations.Setting;
-import org.springframework.data.mapping.model.BasicPersistentEntity;
-import org.springframework.data.util.TypeInformation;
-import org.springframework.expression.Expression;
-import org.springframework.expression.ParserContext;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.expression.spel.support.StandardEvaluationContext;
-import org.springframework.util.Assert;
-
-/**
- * Elasticsearch specific {@link org.springframework.data.mapping.PersistentEntity} implementation holding
- *
- * @param <T>
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntity<T, ElasticsearchPersistentProperty>
-		implements ElasticsearchPersistentEntity<T>, ApplicationContextAware {
-
-	private final StandardEvaluationContext context;
-	private final SpelExpressionParser parser;
-
-	private String indexName;
-	private String indexType;
-	private boolean useServerConfiguration;
-	private short shards;
-	private short replicas;
-	private String refreshInterval;
-	private String indexStoreType;
-	private String parentType;
-	private ElasticsearchPersistentProperty parentIdProperty;
-	private String settingPath;
-	private boolean createIndexAndMapping;
-
-	public SimpleElasticsearchPersistentEntity(TypeInformation<T> typeInformation) {
-		super(typeInformation);
-		this.context = new StandardEvaluationContext();
-		this.parser = new SpelExpressionParser();
-
-		Class<T> clazz = typeInformation.getType();
-		if (clazz.isAnnotationPresent(Document.class)) {
-			Document document = clazz.getAnnotation(Document.class);
-			Assert.hasText(document.indexName(),
-					" Unknown indexName. Make sure the indexName is defined. e.g @Document(indexName=\"foo\")");
-			this.indexName = document.indexName();
-			this.indexType = hasText(document.type()) ? document.type() : clazz.getSimpleName().toLowerCase(Locale.ENGLISH);
-			this.useServerConfiguration = document.useServerConfiguration();
-			this.shards = document.shards();
-			this.replicas = document.replicas();
-			this.refreshInterval = document.refreshInterval();
-			this.indexStoreType = document.indexStoreType();
-			this.createIndexAndMapping = document.createIndex();
-		}
-		if (clazz.isAnnotationPresent(Setting.class)) {
-			this.settingPath = typeInformation.getType().getAnnotation(Setting.class).settingPath();
-		}
-	}
-
-	@Override
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		context.addPropertyAccessor(new BeanFactoryAccessor());
-		context.setBeanResolver(new BeanFactoryResolver(applicationContext));
-		context.setRootObject(applicationContext);
-	}
-
-	@Override
-	public String getIndexName() {
-		Expression expression = parser.parseExpression(indexName, ParserContext.TEMPLATE_EXPRESSION);
-		return expression.getValue(context, String.class);
-	}
-
-	@Override
-	public String getIndexType() {
-		Expression expression = parser.parseExpression(indexType, ParserContext.TEMPLATE_EXPRESSION);
-		return expression.getValue(context, String.class);
-	}
-
-	@Override
-	public String getIndexStoreType() {
-		return indexStoreType;
-	}
-
-	@Override
-	public short getShards() {
-		return shards;
-	}
-
-	@Override
-	public short getReplicas() {
-		return replicas;
-	}
-
-	@Override
-	public boolean isUseServerConfiguration() {
-		return useServerConfiguration;
-	}
-
-	@Override
-	public String getRefreshInterval() {
-		return refreshInterval;
-	}
-
-	@Override
-	public String getParentType() {
-		return parentType;
-	}
-
-	@Override
-	public ElasticsearchPersistentProperty getParentIdProperty() {
-		return parentIdProperty;
-	}
-
-	@Override
-	public String settingPath() {
-		return settingPath;
-	}
-
-	@Override
-	public boolean isCreateIndexAndMapping() {
-		return createIndexAndMapping;
-	}
-
-	@Override
-	public void addPersistentProperty(ElasticsearchPersistentProperty property) {
-		super.addPersistentProperty(property);
-
-		if (property.getField() != null) {
-			Parent parent = property.getField().getAnnotation(Parent.class);
-			if (parent != null) {
-				Assert.isNull(this.parentIdProperty, "Only one field can hold a @Parent annotation");
-				Assert.isNull(this.parentType, "Only one field can hold a @Parent annotation");
-				Assert.isTrue(property.getType() == String.class, "Parent ID property should be String");
-				this.parentIdProperty = property;
-				this.parentType = parent.type();
-			}
-		}
-
-		if (property.isVersionProperty()) {
-			Assert.isTrue(property.getType() == Long.class, "Version property should be Long");
-		}
-	}
-}
+/*
+ * Copyright 2013-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.mapping;
+
+import static org.springframework.util.StringUtils.*;
+
+import java.util.Locale;
+import java.util.Optional;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.expression.BeanFactoryAccessor;
+import org.springframework.context.expression.BeanFactoryResolver;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.annotations.Parent;
+import org.springframework.data.elasticsearch.annotations.Setting;
+import org.springframework.data.mapping.model.BasicPersistentEntity;
+import org.springframework.data.util.TypeInformation;
+import org.springframework.expression.Expression;
+import org.springframework.expression.ParserContext;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+import org.springframework.util.Assert;
+
+/**
+ * Elasticsearch specific {@link org.springframework.data.mapping.PersistentEntity} implementation holding
+ *
+ * @param <T>
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Mark Paluch
+ */
+public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntity<T, ElasticsearchPersistentProperty>
+		implements ElasticsearchPersistentEntity<T>, ApplicationContextAware {
+
+	private final StandardEvaluationContext context;
+	private final SpelExpressionParser parser;
+
+	private String indexName;
+	private String indexType;
+	private boolean useServerConfiguration;
+	private short shards;
+	private short replicas;
+	private String refreshInterval;
+	private String indexStoreType;
+	private String parentType;
+	private ElasticsearchPersistentProperty parentIdProperty;
+	private String settingPath;
+	private boolean createIndexAndMapping;
+
+	public SimpleElasticsearchPersistentEntity(TypeInformation<T> typeInformation) {
+		super(typeInformation);
+		this.context = new StandardEvaluationContext();
+		this.parser = new SpelExpressionParser();
+
+		Class<T> clazz = typeInformation.getType();
+		if (clazz.isAnnotationPresent(Document.class)) {
+			Document document = clazz.getAnnotation(Document.class);
+			Assert.hasText(document.indexName(),
+					" Unknown indexName. Make sure the indexName is defined. e.g @Document(indexName=\"foo\")");
+			this.indexName = document.indexName();
+			this.indexType = hasText(document.type()) ? document.type() : clazz.getSimpleName().toLowerCase(Locale.ENGLISH);
+			this.useServerConfiguration = document.useServerConfiguration();
+			this.shards = document.shards();
+			this.replicas = document.replicas();
+			this.refreshInterval = document.refreshInterval();
+			this.indexStoreType = document.indexStoreType();
+			this.createIndexAndMapping = document.createIndex();
+		}
+		if (clazz.isAnnotationPresent(Setting.class)) {
+			this.settingPath = typeInformation.getType().getAnnotation(Setting.class).settingPath();
+		}
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		context.addPropertyAccessor(new BeanFactoryAccessor());
+		context.setBeanResolver(new BeanFactoryResolver(applicationContext));
+		context.setRootObject(applicationContext);
+	}
+
+	@Override
+	public String getIndexName() {
+		Expression expression = parser.parseExpression(indexName, ParserContext.TEMPLATE_EXPRESSION);
+		return expression.getValue(context, String.class);
+	}
+
+	@Override
+	public String getIndexType() {
+		Expression expression = parser.parseExpression(indexType, ParserContext.TEMPLATE_EXPRESSION);
+		return expression.getValue(context, String.class);
+	}
+
+	@Override
+	public String getIndexStoreType() {
+		return indexStoreType;
+	}
+
+	@Override
+	public short getShards() {
+		return shards;
+	}
+
+	@Override
+	public short getReplicas() {
+		return replicas;
+	}
+
+	@Override
+	public boolean isUseServerConfiguration() {
+		return useServerConfiguration;
+	}
+
+	@Override
+	public String getRefreshInterval() {
+		return refreshInterval;
+	}
+
+	@Override
+	public String getParentType() {
+		return parentType;
+	}
+
+	@Override
+	public ElasticsearchPersistentProperty getParentIdProperty() {
+		return parentIdProperty;
+	}
+
+	@Override
+	public String settingPath() {
+		return settingPath;
+	}
+
+	@Override
+	public boolean isCreateIndexAndMapping() {
+		return createIndexAndMapping;
+	}
+
+	@Override
+	public void addPersistentProperty(ElasticsearchPersistentProperty property) {
+		super.addPersistentProperty(property);
+
+		Parent annotation = property.findAnnotation(Parent.class);
+
+		if (annotation != null) {
+			Assert.isNull(this.parentIdProperty, "Only one field can hold a @Parent annotation");
+			Assert.isNull(this.parentType, "Only one field can hold a @Parent annotation");
+			Assert.isTrue(property.getType() == String.class, "Parent ID property should be String");
+			this.parentIdProperty = property;
+			this.parentType = annotation.type();
+		}
+
+		if (property.isVersionProperty()) {
+			Assert.isTrue(property.getType() == Long.class, "Version property should be Long");
+		}
+	}
+}

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,14 +29,15 @@ import org.springframework.util.Assert;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
+ * @author Mark Paluch
  */
 abstract class AbstractQuery implements Query {
 
 	protected Pageable pageable = DEFAULT_PAGE;
 	protected Sort sort;
-	protected List<String> indices = new ArrayList<String>();
-	protected List<String> types = new ArrayList<String>();
-	protected List<String> fields = new ArrayList<String>();
+	protected List<String> indices = new ArrayList<>();
+	protected List<String> types = new ArrayList<>();
+	protected List<String> fields = new ArrayList<>();
 	protected SourceFilter sourceFilter;
 	protected float minScore;
 	protected Collection<String> ids;
@@ -55,7 +56,9 @@ abstract class AbstractQuery implements Query {
 
 	@Override
 	public final <T extends Query> T setPageable(Pageable pageable) {
-		Assert.notNull(pageable);
+		
+		Assert.notNull(pageable, "Pageable must not be null!");
+		
 		this.pageable = pageable;
 		return (T) this.addSort(pageable.getSort());
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -57,11 +57,11 @@ public class Criteria {
 	private float boost = Float.NaN;
 	private boolean negating = false;
 
-	private List<Criteria> criteriaChain = new ArrayList<Criteria>(1);
+	private List<Criteria> criteriaChain = new ArrayList<>(1);
 
-	private Set<CriteriaEntry> queryCriteria = new LinkedHashSet<CriteriaEntry>();
+	private Set<CriteriaEntry> queryCriteria = new LinkedHashSet<>();
 
-	private Set<CriteriaEntry> filterCriteria = new LinkedHashSet<CriteriaEntry>();
+	private Set<CriteriaEntry> filterCriteria = new LinkedHashSet<>();
 
 	public Criteria() {
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,24 +23,26 @@ import org.springframework.util.Assert;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
+ * @author Mark Paluch
  */
 public class CriteriaQuery extends AbstractQuery {
 
 	private Criteria criteria;
 
-	private CriteriaQuery() {
-	}
+	private CriteriaQuery() {}
 
 	public CriteriaQuery(Criteria criteria) {
-		this(criteria, null);
+		this(criteria, Pageable.unpaged());
 	}
 
 	public CriteriaQuery(Criteria criteria, Pageable pageable) {
+
+		Assert.notNull(criteria, "Criteria must not be null!");
+		Assert.notNull(pageable, "Pageable must not be null!");
+
 		this.criteria = criteria;
 		this.pageable = pageable;
-		if (pageable != null) {
-			this.addSort(pageable.getSort());
-		}
+		this.addSort(pageable.getSort());
 	}
 
 	public static final Query fromQuery(CriteriaQuery source) {

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,20 +29,19 @@ import org.springframework.data.domain.Pageable;
  * @author Rizwan Idrees
  * @author Mohsin Husen
  */
-
 public class MoreLikeThisQuery {
 
 	private String id;
 	private String indexName;
 	private String type;
-	private List<String> searchIndices = new ArrayList<String>();
-	private List<String> searchTypes = new ArrayList<String>();
-	private List<String> fields = new ArrayList<String>();
+	private List<String> searchIndices = new ArrayList<>();
+	private List<String> searchTypes = new ArrayList<>();
+	private List<String> fields = new ArrayList<>();
 	private String routing;
 	private Float percentTermsToMatch;
 	private Integer minTermFreq;
 	private Integer maxQueryTerms;
-	private List<String> stopWords = new ArrayList<String>();
+	private List<String> stopWords = new ArrayList<>();
 	private Integer minDocFreq;
 	private Integer maxDocFreq;
 	private Integer minWordLen;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,9 @@ import java.util.List;
 
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.highlight.HighlightBuilder;
+import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
 
 import java.util.Arrays;
 
@@ -37,8 +38,8 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
 	private QueryBuilder query;
 	private QueryBuilder filter;
 	private List<SortBuilder> sorts;
-    private final List<ScriptField> scriptFields = new ArrayList<ScriptField>();
-	/*private List<FacetRequest> facets;*/
+    private final List<ScriptField> scriptFields = new ArrayList<>();
+	private List<FacetRequest> facets;
 	private List<AbstractAggregationBuilder> aggregations;
 	private HighlightBuilder.Field[] highlightFields;
 	private List<IndexBoost> indicesBoost;
@@ -94,9 +95,9 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
         scriptFields.addAll(Arrays.asList(scriptField));
     }
 
-/*	public void addFacet(FacetRequest facetRequest) {
+	public void addFacet(FacetRequest facetRequest) {
 		if (facets == null) {
-			facets = new ArrayList<FacetRequest>();
+			facets = new ArrayList<>();
 		}
 		facets.add(facetRequest);
 	}
@@ -108,7 +109,7 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
 	@Override
 	public List<FacetRequest> getFacets() {
 		return facets;
-	}*/
+	}
 
 	@Override
 	public List<AbstractAggregationBuilder> getAggregations() {
@@ -118,7 +119,7 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
 
 	public void addAggregation(AbstractAggregationBuilder aggregationBuilder) {
 		if (aggregations == null) {
-			aggregations = new ArrayList<AbstractAggregationBuilder>();
+			aggregations = new ArrayList<>();
 		}
 		aggregations.add(aggregationBuilder);
 	}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,9 +22,10 @@ import java.util.List;
 import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.highlight.HighlightBuilder;
+import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
 
 /**
  * NativeSearchQuery
@@ -32,17 +33,18 @@ import org.springframework.data.domain.Pageable;
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Artur Konczak
+ * @author Mark Paluch
  */
-
 public class NativeSearchQueryBuilder {
 
 	private QueryBuilder queryBuilder;
 	private QueryBuilder filterBuilder;
-    private List<ScriptField> scriptFields = new ArrayList<ScriptField>();
-	private List<SortBuilder> sortBuilders = new ArrayList<SortBuilder>();
-	private List<AbstractAggregationBuilder> aggregationBuilders = new ArrayList<AbstractAggregationBuilder>();
+    private List<ScriptField> scriptFields = new ArrayList<>();
+	private List<SortBuilder> sortBuilders = new ArrayList<>();
+	private List<FacetRequest> facetRequests = new ArrayList<>();
+	private List<AbstractAggregationBuilder> aggregationBuilders = new ArrayList<>();
 	private HighlightBuilder.Field[] highlightFields;
-	private Pageable pageable;
+	private Pageable pageable = Pageable.unpaged();
 	private String[] indices;
 	private String[] types;
 	private String[] fields;
@@ -78,10 +80,10 @@ public class NativeSearchQueryBuilder {
 		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;
@@ -140,9 +142,7 @@ public class NativeSearchQueryBuilder {
 
 	public NativeSearchQuery build() {
 		NativeSearchQuery nativeSearchQuery = new NativeSearchQuery(queryBuilder, filterBuilder, sortBuilders, highlightFields);
-		if (pageable != null) {
-			nativeSearchQuery.setPageable(pageable);
-		}
+		nativeSearchQuery.setPageable(pageable);
 
 		if (indices != null) {
 			nativeSearchQuery.addIndices(indices);
@@ -159,15 +159,19 @@ public class NativeSearchQueryBuilder {
 		if (sourceFilter != null) {
 			nativeSearchQuery.addSourceFilter(sourceFilter);
 		}
-		
+
 		if(indicesBoost != null) {
 		    nativeSearchQuery.setIndicesBoost(indicesBoost);
 		}
-		
+
         if (!isEmpty(scriptFields)) {
             nativeSearchQuery.setScriptFields(scriptFields);
         }
 
+		if (!isEmpty(facetRequests)) {
+			nativeSearchQuery.setFacets(facetRequests);
+		}
+
 		if (!isEmpty(aggregationBuilders)) {
 			nativeSearchQuery.setAggregations(aggregationBuilders);
 		}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@ package org.springframework.data.elasticsearch.core.query;
 
 import java.util.Collection;
 import java.util.List;
-
 import org.elasticsearch.action.search.SearchType;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
@@ -28,11 +27,12 @@ import org.springframework.data.domain.Sort;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
+ * @author Mark Paluch
  */
 public interface Query {
 
-	public static final int DEFAULT_PAGE_SIZE = 10;
-	public static final Pageable DEFAULT_PAGE = new PageRequest(0, DEFAULT_PAGE_SIZE);
+	int DEFAULT_PAGE_SIZE = 10;
+	Pageable DEFAULT_PAGE = PageRequest.of(0, DEFAULT_PAGE_SIZE);
 
 	/**
 	 * restrict result to entries on given page. Corresponds to the 'start' and 'rows' parameter in elasticsearch
@@ -42,13 +42,6 @@ public interface Query {
 	 */
 	<T extends Query> T setPageable(Pageable pageable);
 
-	/**
-	 * Get filter queries if defined
-	 *
-	 * @return
-	 */
-	// List<FilterQuery> getFilterQueries();
-
 	/**
 	 * Get page settings if defined
 	 *

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

@@ -19,8 +19,9 @@ import java.util.List;
 
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.highlight.HighlightBuilder;
+import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
 
 /**
  * NativeSearchQuery
@@ -37,7 +38,8 @@ public interface SearchQuery extends Query {
 
 	List<SortBuilder> getElasticsearchSorts();
 
-	/*List<FacetRequest> getFacets();*/
+	@Deprecated
+	List<FacetRequest> getFacets();
 
 	List<AbstractAggregationBuilder> getAggregations();
 

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

@@ -43,4 +43,6 @@ public interface ElasticsearchRepository<T, ID extends Serializable> extends Ela
 	Page<T> searchSimilar(T entity, String[] fields, Pageable pageable);
 
 	void refresh();
+
+	Class<T> getEntityClass();
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,13 @@
  */
 package org.springframework.data.elasticsearch.repository.cdi;
 
+import java.lang.annotation.Annotation;
+import java.util.Optional;
+import java.util.Set;
+
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.BeanManager;
-import java.lang.annotation.Annotation;
-import java.util.Set;
 
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.repository.support.ElasticsearchRepositoryFactory;
@@ -28,7 +30,8 @@ import org.springframework.data.repository.config.CustomRepositoryImplementation
 import org.springframework.util.Assert;
 
 /**
- * Uses CdiRepositoryBean to create ElasticsearchRepository instances.
+ * Uses {@link CdiRepositoryBean} to create
+ * {@link org.springframework.data.elasticsearch.repository.ElasticsearchRepository} instances.
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
@@ -46,24 +49,37 @@ public class ElasticsearchRepositoryBean<T> extends CdiRepositoryBean<T> {
 	 * @param repositoryType must not be {@literal null}.
 	 * @param beanManager must not be {@literal null}.
 	 * @param detector detector for the custom {@link org.springframework.data.repository.Repository} implementations
-	 * {@link CustomRepositoryImplementationDetector}, can be {@literal null}.
+	 *          {@link CustomRepositoryImplementationDetector}, can be {@literal null}.
 	 */
 	public ElasticsearchRepositoryBean(Bean<ElasticsearchOperations> operations, Set<Annotation> qualifiers,
-									   Class<T> repositoryType, BeanManager beanManager, CustomRepositoryImplementationDetector detector) {
-		super(qualifiers, repositoryType, beanManager, detector);
+			Class<T> repositoryType, BeanManager beanManager, CustomRepositoryImplementationDetector detector) {
+
+		super(qualifiers, repositoryType, beanManager, Optional.of(detector));
 
 		Assert.notNull(operations, "Cannot create repository with 'null' for ElasticsearchOperations.");
 		this.elasticsearchOperationsBean = operations;
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.repository.cdi.CdiRepositoryBean#create(javax.enterprise.context.spi.CreationalContext, java.lang.Class, java.util.Optional)
+	 */
 	@Override
-	protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType, Object customImplementation) {
+	protected T create(CreationalContext<T> creationalContext, Class<T> repositoryType,
+			Optional<Object> customImplementation) {
+
 		ElasticsearchOperations elasticsearchOperations = getDependencyInstance(elasticsearchOperationsBean,
 				ElasticsearchOperations.class);
-		return new ElasticsearchRepositoryFactory(elasticsearchOperations).getRepository(repositoryType,
-				customImplementation);
+
+		ElasticsearchRepositoryFactory factory = new ElasticsearchRepositoryFactory(elasticsearchOperations);
+
+		return customImplementation //
+				.map(o -> factory.getRepository(repositoryType, o)) //
+				.orElseGet(() -> factory.getRepository(repositoryType));
 	}
 
+	/* (non-Javadoc)
+	 * @see org.springframework.data.repository.cdi.CdiRepositoryBean#getScope()
+	 */
 	@Override
 	public Class<? extends Annotation> getScope() {
 		return elasticsearchOperationsBean.getScope();

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,6 @@
  */
 package org.springframework.data.elasticsearch.repository.cdi;
 
-import javax.enterprise.event.Observes;
-import javax.enterprise.inject.UnsatisfiedResolutionException;
-import javax.enterprise.inject.spi.AfterBeanDiscovery;
-import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.BeanManager;
-import javax.enterprise.inject.spi.ProcessBean;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
 import java.util.HashMap;
@@ -28,6 +22,13 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import javax.enterprise.event.Observes;
+import javax.enterprise.inject.UnsatisfiedResolutionException;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
+import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.spi.BeanManager;
+import javax.enterprise.inject.spi.ProcessBean;
+
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.repository.cdi.CdiRepositoryBean;
 import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport;
@@ -42,7 +43,7 @@ import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport;
  */
 public class ElasticsearchRepositoryExtension extends CdiRepositoryExtensionSupport {
 
-	private final Map<Set<Annotation>, Bean<ElasticsearchOperations>> elasticsearchOperationsMap = new HashMap<Set<Annotation>, Bean<ElasticsearchOperations>>();
+	private final Map<Set<Annotation>, Bean<ElasticsearchOperations>> elasticsearchOperationsMap = new HashMap<>();
 
 	@SuppressWarnings("unchecked")
 	<T> void processBean(@Observes ProcessBean<T> processBean) {
@@ -67,16 +68,16 @@ public class ElasticsearchRepositoryExtension extends CdiRepositoryExtensionSupp
 	}
 
 	private <T> CdiRepositoryBean<T> createRepositoryBean(Class<T> repositoryType, Set<Annotation> qualifiers,
-														  BeanManager beanManager) {
+			BeanManager beanManager) {
 
-		Bean<ElasticsearchOperations> elasticsearchOperationsBean = this.elasticsearchOperationsMap.get(qualifiers);
-
-		if (elasticsearchOperationsBean == null) {
+		if (!this.elasticsearchOperationsMap.containsKey(qualifiers)) {
 			throw new UnsatisfiedResolutionException(String.format("Unable to resolve a bean for '%s' with qualifiers %s.",
 					ElasticsearchOperations.class.getName(), qualifiers));
 		}
 
-		return new ElasticsearchRepositoryBean<T>(elasticsearchOperationsBean, qualifiers, repositoryType, beanManager,
+		Bean<ElasticsearchOperations> elasticsearchOperationsBean = this.elasticsearchOperationsMap.get(qualifiers);
+
+		return new ElasticsearchRepositoryBean<>(elasticsearchOperationsBean, qualifiers, repositoryType, beanManager,
 				getCustomImplementationDetector());
 	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,15 +38,16 @@ import org.w3c.dom.Element;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
+ * @author Mark Paluch
  */
 public class ElasticsearchRepositoryConfigExtension extends RepositoryConfigurationExtensionSupport {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getRepositoryFactoryClassName()
+	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtension#getRepositoryFactoryBeanClassName()
 	 */
 	@Override
-	public String getRepositoryFactoryClassName() {
+	public String getRepositoryFactoryBeanClassName() {
 		return ElasticsearchRepositoryFactoryBean.class.getName();
 	}
 
@@ -59,7 +60,7 @@ public class ElasticsearchRepositoryConfigExtension extends RepositoryConfigurat
 		return "elasticsearch";
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.AnnotationRepositoryConfigurationSource)
 	 */
@@ -70,7 +71,7 @@ public class ElasticsearchRepositoryConfigExtension extends RepositoryConfigurat
 		builder.addPropertyReference("elasticsearchOperations", attributes.getString("elasticsearchTemplateRef"));
 	}
 
-	/* 
+	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.repository.config.RepositoryConfigurationExtensionSupport#postProcess(org.springframework.beans.factory.support.BeanDefinitionBuilder, org.springframework.data.repository.config.XmlRepositoryConfigurationSource)
 	 */
@@ -87,7 +88,7 @@ public class ElasticsearchRepositoryConfigExtension extends RepositoryConfigurat
 	 */
 	@Override
 	protected Collection<Class<? extends Annotation>> getIdentifyingAnnotations() {
-		return Collections.<Class<? extends Annotation>>singleton(Document.class);
+		return Collections.<Class<? extends Annotation>> singleton(Document.class);
 	}
 
 	/*
@@ -96,6 +97,6 @@ public class ElasticsearchRepositoryConfigExtension extends RepositoryConfigurat
 	*/
 	@Override
 	protected Collection<Class<?>> getIdentifyingTypes() {
-		return Arrays.<Class<?>>asList(ElasticsearchRepository.class, ElasticsearchCrudRepository.class);
+		return Arrays.<Class<?>> asList(ElasticsearchRepository.class, ElasticsearchCrudRepository.class);
 	}
 }

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

@@ -48,7 +48,7 @@ public @interface EnableElasticsearchRepositories {
 
 	/**
 	 * Base packages to scan for annotated components. {@link #value()} is an alias for (and mutually exclusive with) this
-	 * attribute. Use {@link #basePackageClasses()} for a type-safe alternative to String-based package names.
+	 * attribute. Use {@link #basePackageClasses()} for a type-safe alternative to text-based package names.
 	 */
 	String[] basePackages() default {};
 

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package org.springframework.data.elasticsearch.repository.query;
 
 import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
 import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
@@ -33,6 +34,7 @@ import org.springframework.data.util.StreamUtils;
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Kevin Leturc
+ * @author Mark Paluch
  */
 public class ElasticsearchPartQuery extends AbstractElasticsearchRepositoryQuery {
 
@@ -58,8 +60,9 @@ public class ElasticsearchPartQuery extends AbstractElasticsearchRepositoryQuery
 			return elasticsearchOperations.queryForPage(query, queryMethod.getEntityInformation().getJavaType());
 		} else if (queryMethod.isStreamQuery()) {
 			Class<?> entityType = queryMethod.getEntityInformation().getJavaType();
-			if (query.getPageable() == null) {
-				query.setPageable(new PageRequest(0, 20));
+			if (query.getPageable().isUnpaged()) {
+				int itemCount = (int) elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType());
+				query.setPageable(PageRequest.of(0, Math.max(1, itemCount)));
 			}
 
 			return StreamUtils.createStreamFromIterator((CloseableIterator<Object>) elasticsearchOperations.stream(query, entityType));
@@ -67,7 +70,7 @@ public class ElasticsearchPartQuery extends AbstractElasticsearchRepositoryQuery
 		} else if (queryMethod.isCollectionQuery()) {
 			if (accessor.getPageable() == null) {
 				int itemCount = (int) elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType());
-				query.setPageable(new PageRequest(0, Math.max(1, itemCount)));
+				query.setPageable(PageRequest.of(0, Math.max(1, itemCount)));
 			} else {
 			    query.setPageable(accessor.getPageable());
 		    }
@@ -83,9 +86,9 @@ public class ElasticsearchPartQuery extends AbstractElasticsearchRepositoryQuery
 		Object result = null;
 
 		if (queryMethod.isCollectionQuery()) {
-			if (accessor.getPageable() == null) {
+			if (accessor.getPageable().isUnpaged()) {
 				int itemCount = (int) elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType());
-				query.setPageable(new PageRequest(0, Math.max(1, itemCount)));
+				query.setPageable(PageRequest.of(0, Math.max(1, itemCount)));
 			} else {
 				query.setPageable(accessor.getPageable());
 			}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,7 +22,6 @@ import org.springframework.data.elasticsearch.annotations.Query;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.util.StringUtils;
 
 /**
  * ElasticsearchQueryMethod
@@ -30,6 +29,7 @@ import org.springframework.util.StringUtils;
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Oliver Gierke
+ * @author Mark Paluch
  */
 public class ElasticsearchQueryMethod extends QueryMethod {
 
@@ -45,7 +45,6 @@ public class ElasticsearchQueryMethod extends QueryMethod {
 	}
 
 	public String getAnnotatedQuery() {
-		String query = (String) AnnotationUtils.getValue(queryAnnotation, "value");
-		return StringUtils.hasText(query) ? query : null;
+		return (String) AnnotationUtils.getValue(queryAnnotation, "value");
 	}
 }

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

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

src/main/java/org/springframework/data/elasticsearch/repository/support/AbstractElasticsearchRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,15 +23,25 @@ import java.lang.reflect.Type;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.domain.*;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
-import org.springframework.data.elasticsearch.core.query.*;
+import org.springframework.data.elasticsearch.core.query.DeleteQuery;
+import org.springframework.data.elasticsearch.core.query.GetQuery;
+import org.springframework.data.elasticsearch.core.query.IndexQuery;
+import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
+import org.springframework.data.elasticsearch.core.query.SearchQuery;
 import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
 import org.springframework.util.Assert;
 
@@ -43,27 +53,32 @@ import org.springframework.util.Assert;
  * @author Mohsin Husen
  * @author Ryan Henszey
  * @author Kevin Leturc
+ * @author Mark Paluch
+ * @author Christoph Strobl
  */
-public abstract class AbstractElasticsearchRepository<T, ID extends Serializable> implements
-		ElasticsearchRepository<T, ID> {
+public abstract class AbstractElasticsearchRepository<T, ID extends Serializable>
+		implements ElasticsearchRepository<T, ID> {
 
 	static final Logger LOGGER = LoggerFactory.getLogger(AbstractElasticsearchRepository.class);
 	protected ElasticsearchOperations elasticsearchOperations;
 	protected Class<T> entityClass;
 	protected ElasticsearchEntityInformation<T, ID> entityInformation;
 
-	public AbstractElasticsearchRepository() {
-	}
+	public AbstractElasticsearchRepository() {}
 
 	public AbstractElasticsearchRepository(ElasticsearchOperations elasticsearchOperations) {
-		Assert.notNull(elasticsearchOperations);
+
+		Assert.notNull(elasticsearchOperations, "ElasticsearchOperations must not be null!");
+
 		this.setElasticsearchOperations(elasticsearchOperations);
 	}
 
 	public AbstractElasticsearchRepository(ElasticsearchEntityInformation<T, ID> metadata,
-										   ElasticsearchOperations elasticsearchOperations) {
+			ElasticsearchOperations elasticsearchOperations) {
 		this(elasticsearchOperations);
-		Assert.notNull(metadata);
+
+		Assert.notNull(metadata, "ElasticsearchEntityInformation must not be null!");
+
 		this.entityInformation = metadata;
 		setEntityClass(this.entityInformation.getJavaType());
 		try {
@@ -89,19 +104,19 @@ public abstract class AbstractElasticsearchRepository<T, ID extends Serializable
 	}
 
 	@Override
-	public T findOne(ID id) {
+	public Optional<T> findById(ID id) {
 		GetQuery query = new GetQuery();
 		query.setId(stringIdRepresentation(id));
-		return elasticsearchOperations.queryForObject(query, getEntityClass());
+		return Optional.ofNullable(elasticsearchOperations.queryForObject(query, getEntityClass()));
 	}
 
 	@Override
 	public Iterable<T> findAll() {
 		int itemCount = (int) this.count();
 		if (itemCount == 0) {
-			return new PageImpl<T>(Collections.<T>emptyList());
+			return new PageImpl<>(Collections.<T> emptyList());
 		}
-		return this.findAll(new PageRequest(0, Math.max(1, itemCount)));
+		return this.findAll(PageRequest.of(0, Math.max(1, itemCount)));
 	}
 
 	@Override
@@ -114,19 +129,17 @@ public abstract class AbstractElasticsearchRepository<T, ID extends Serializable
 	public Iterable<T> findAll(Sort sort) {
 		int itemCount = (int) this.count();
 		if (itemCount == 0) {
-			return new PageImpl<T>(Collections.<T>emptyList());
+			return new PageImpl<>(Collections.<T> emptyList());
 		}
 		SearchQuery query = new NativeSearchQueryBuilder().withQuery(matchAllQuery())
-				.withPageable(new PageRequest(0, itemCount, sort)).build();
+				.withPageable(PageRequest.of(0, itemCount, sort)).build();
 		return elasticsearchOperations.queryForPage(query, getEntityClass());
 	}
 
 	@Override
-	public Iterable<T> findAll(Iterable<ID> ids) {
+	public Iterable<T> findAllById(Iterable<ID> ids) {
 		Assert.notNull(ids, "ids can't be null.");
-		SearchQuery query = new NativeSearchQueryBuilder()
-				.withIds(stringIdsRepresentation(ids))
-				.build();
+		SearchQuery query = new NativeSearchQueryBuilder().withIds(stringIdsRepresentation(ids)).build();
 		return elasticsearchOperations.multiGet(query, getEntityClass());
 	}
 
@@ -147,7 +160,7 @@ public abstract class AbstractElasticsearchRepository<T, ID extends Serializable
 	public <S extends T> List<S> save(List<S> entities) {
 		Assert.notNull(entities, "Cannot insert 'null' as a List.");
 		Assert.notEmpty(entities, "Cannot insert empty List.");
-		List<IndexQuery> queries = new ArrayList<IndexQuery>();
+		List<IndexQuery> queries = new ArrayList<>();
 		for (S s : entities) {
 			queries.add(createIndexQuery(s));
 		}
@@ -162,9 +175,9 @@ public abstract class AbstractElasticsearchRepository<T, ID extends Serializable
 	}
 
 	@Override
-	public <S extends T> Iterable<S> save(Iterable<S> entities) {
+	public <S extends T> Iterable<S> saveAll(Iterable<S> entities) {
 		Assert.notNull(entities, "Cannot insert 'null' as a List.");
-		List<IndexQuery> queries = new ArrayList<IndexQuery>();
+		List<IndexQuery> queries = new ArrayList<>();
 		for (S s : entities) {
 			queries.add(createIndexQuery(s));
 		}
@@ -174,8 +187,8 @@ public abstract class AbstractElasticsearchRepository<T, ID extends Serializable
 	}
 
 	@Override
-	public boolean exists(ID id) {
-		return findOne(id) != null;
+	public boolean existsById(ID id) {
+		return findById(id) != null;
 	}
 
 	@Override
@@ -183,9 +196,9 @@ public abstract class AbstractElasticsearchRepository<T, ID extends Serializable
 		SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(query).build();
 		int count = (int) elasticsearchOperations.count(searchQuery, getEntityClass());
 		if (count == 0) {
-			return new PageImpl<T>(Collections.<T>emptyList());
+			return new PageImpl<>(Collections.<T> emptyList());
 		}
-		searchQuery.setPageable(new PageRequest(0, count));
+		searchQuery.setPageable(PageRequest.of(0, count));
 		return elasticsearchOperations.queryForPage(searchQuery, getEntityClass());
 	}
 
@@ -214,7 +227,7 @@ public abstract class AbstractElasticsearchRepository<T, ID extends Serializable
 	}
 
 	@Override
-	public void delete(ID id) {
+	public void deleteById(ID id) {
 		Assert.notNull(id, "Cannot delete entity with id 'null'.");
 		elasticsearchOperations.delete(entityInformation.getIndexName(), entityInformation.getType(),
 				stringIdRepresentation(id));
@@ -224,12 +237,12 @@ public abstract class AbstractElasticsearchRepository<T, ID extends Serializable
 	@Override
 	public void delete(T entity) {
 		Assert.notNull(entity, "Cannot delete 'null' entity.");
-		delete(extractIdFromBean(entity));
+		deleteById(extractIdFromBean(entity));
 		elasticsearchOperations.refresh(entityInformation.getIndexName());
 	}
 
 	@Override
-	public void delete(Iterable<? extends T> entities) {
+	public void deleteAll(Iterable<? extends T> entities) {
 		Assert.notNull(entities, "Cannot delete 'null' list.");
 		for (T entity : entities) {
 			delete(entity);
@@ -276,6 +289,7 @@ public abstract class AbstractElasticsearchRepository<T, ID extends Serializable
 		return resolveReturnedClassFromGenericType(clazz.getSuperclass());
 	}
 
+	@Override
 	public Class<T> getEntityClass() {
 		if (!isEntityClassSet()) {
 			try {
@@ -302,15 +316,12 @@ public abstract class AbstractElasticsearchRepository<T, ID extends Serializable
 	}
 
 	protected ID extractIdFromBean(T entity) {
-		if (entityInformation != null) {
-			return entityInformation.getId(entity);
-		}
-		return null;
+		return entityInformation.getId(entity);
 	}
 
 	private List<String> stringIdsRepresentation(Iterable<ID> ids) {
 		Assert.notNull(ids, "ids can't be null.");
-		List<String> stringIds = new ArrayList<String>();
+		List<String> stringIds = new ArrayList<>();
 		for (ID id : ids) {
 			stringIds.add(stringIdRepresentation(id));
 		}
@@ -320,16 +331,10 @@ public abstract class AbstractElasticsearchRepository<T, ID extends Serializable
 	protected abstract String stringIdRepresentation(ID id);
 
 	private Long extractVersionFromBean(T entity) {
-		if (entityInformation != null) {
-			return entityInformation.getVersion(entity);
-		}
-		return null;
+		return entityInformation.getVersion(entity);
 	}
 
 	private String extractParentIdFromBean(T entity) {
-		if (entityInformation != null) {
-			return entityInformation.getParentId(entity);
-		}
-		return null;
+		return entityInformation.getParentId(entity);
 	}
 }

src/main/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchEntityInformation.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package org.springframework.data.elasticsearch.repository.support;
 
-import java.io.Serializable;
-
 import org.springframework.data.repository.core.EntityInformation;
 
 /**
@@ -24,8 +22,9 @@ import org.springframework.data.repository.core.EntityInformation;
  * @param <ID>
  * @author Rizwan Idrees
  * @author Mohsin Husen
+ * @author Christoph Strobl
  */
-public interface ElasticsearchEntityInformation<T, ID extends Serializable> extends EntityInformation<T, ID> {
+public interface ElasticsearchEntityInformation<T, ID> extends EntityInformation<T, ID> {
 
 	String getIdAttribute();
 

src/main/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchEntityInformationCreator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,15 +15,14 @@
  */
 package org.springframework.data.elasticsearch.repository.support;
 
-import java.io.Serializable;
-
 /**
  * ElasticsearchEntityInformationCreator
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
+ * @author Christoph Strobl
  */
 public interface ElasticsearchEntityInformationCreator {
 
-	<T, ID extends Serializable> ElasticsearchEntityInformation<T, ID> getEntityInformation(Class<T> domainClass);
+	<T, ID> ElasticsearchEntityInformation<T, ID> getEntityInformation(Class<T> domainClass);
 }

src/main/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchEntityInformationCreatorImpl.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,6 @@
  */
 package org.springframework.data.elasticsearch.repository.support;
 
-import java.io.Serializable;
-
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
 import org.springframework.data.mapping.context.MappingContext;
@@ -28,6 +26,8 @@ import org.springframework.util.Assert;
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Oliver Gierke
+ * @author Mark Paluch
+ * @author Christoph Strobl
  */
 public class ElasticsearchEntityInformationCreatorImpl implements ElasticsearchEntityInformationCreator {
 
@@ -35,20 +35,22 @@ public class ElasticsearchEntityInformationCreatorImpl implements ElasticsearchE
 
 	public ElasticsearchEntityInformationCreatorImpl(
 			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
-		Assert.notNull(mappingContext);
+
+		Assert.notNull(mappingContext, "MappingContext must not be null!");
+
 		this.mappingContext = mappingContext;
 	}
 
 	@Override
 	@SuppressWarnings("unchecked")
-	public <T, ID extends Serializable> ElasticsearchEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
+	public <T, ID> ElasticsearchEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
 
 		ElasticsearchPersistentEntity<T> persistentEntity = (ElasticsearchPersistentEntity<T>) mappingContext
-				.getPersistentEntity(domainClass);
+				.getRequiredPersistentEntity(domainClass);
 
 		Assert.notNull(persistentEntity, String.format("Unable to obtain mapping metadata for %s!", domainClass));
 		Assert.notNull(persistentEntity.getIdProperty(), String.format("No id property found for %s!", domainClass));
 
-		return new MappingElasticsearchEntityInformation<T, ID>(persistentEntity);
+		return new MappingElasticsearchEntityInformation<>(persistentEntity);
 	}
 }

src/main/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchRepositoryFactory.java

@@ -1,115 +1,126 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.repository.support;
-
-import static org.springframework.data.querydsl.QueryDslUtils.*;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-
-import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
-import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
-import org.springframework.data.elasticsearch.repository.query.ElasticsearchPartQuery;
-import org.springframework.data.elasticsearch.repository.query.ElasticsearchQueryMethod;
-import org.springframework.data.elasticsearch.repository.query.ElasticsearchStringQuery;
-import org.springframework.data.projection.ProjectionFactory;
-import org.springframework.data.querydsl.QueryDslPredicateExecutor;
-import org.springframework.data.repository.core.NamedQueries;
-import org.springframework.data.repository.core.RepositoryInformation;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.core.support.RepositoryFactorySupport;
-import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.RepositoryQuery;
-import org.springframework.util.Assert;
-
-/**
- * Factory to create {@link ElasticsearchRepository}
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Ryan Henszey
- */
-public class ElasticsearchRepositoryFactory extends RepositoryFactorySupport {
-
-	private final ElasticsearchOperations elasticsearchOperations;
-	private final ElasticsearchEntityInformationCreator entityInformationCreator;
-
-	public ElasticsearchRepositoryFactory(ElasticsearchOperations elasticsearchOperations) {
-		Assert.notNull(elasticsearchOperations);
-		this.elasticsearchOperations = elasticsearchOperations;
-		this.entityInformationCreator = new ElasticsearchEntityInformationCreatorImpl(elasticsearchOperations
-				.getElasticsearchConverter().getMappingContext());
-	}
-
-	@Override
-	public <T, ID extends Serializable> ElasticsearchEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
-		return entityInformationCreator.getEntityInformation(domainClass);
-	}
-
-	@Override
-	@SuppressWarnings({"rawtypes", "unchecked"})
-	protected Object getTargetRepository(RepositoryInformation metadata) {
-		return getTargetRepositoryViaReflection(metadata,getEntityInformation(metadata.getDomainType()), elasticsearchOperations);
-	}
-
-	@Override
-	protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
-		if (isQueryDslRepository(metadata.getRepositoryInterface())) {
-			throw new IllegalArgumentException("QueryDsl Support has not been implemented yet.");
-		}
-		if (Integer.class.isAssignableFrom(metadata.getIdType())
-				|| Long.class.isAssignableFrom(metadata.getIdType())
-				|| Double.class.isAssignableFrom(metadata.getIdType())) {
-			return NumberKeyedRepository.class;
-		} else if (metadata.getIdType() == String.class) {
-			return SimpleElasticsearchRepository.class;
-		} else {
-			throw new IllegalArgumentException("Unsuppored ID type " + metadata.getIdType());
-		}
-	}
-
-	private static boolean isQueryDslRepository(Class<?> repositoryInterface) {
-		return QUERY_DSL_PRESENT && QueryDslPredicateExecutor.class.isAssignableFrom(repositoryInterface);
-	}
-
-	@Override
-	protected QueryLookupStrategy getQueryLookupStrategy(QueryLookupStrategy.Key key) {
-		return new ElasticsearchQueryLookupStrategy();
-	}
-
-	private class ElasticsearchQueryLookupStrategy implements QueryLookupStrategy {
-		
-		/* 
-		 * (non-Javadoc)
-		 * @see org.springframework.data.repository.query.QueryLookupStrategy#resolveQuery(java.lang.reflect.Method, org.springframework.data.repository.core.RepositoryMetadata, org.springframework.data.projection.ProjectionFactory, org.springframework.data.repository.core.NamedQueries)
-		 */
-		@Override
-		public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory,
-				NamedQueries namedQueries) {
-
-			ElasticsearchQueryMethod queryMethod = new ElasticsearchQueryMethod(method, metadata, factory);
-			String namedQueryName = queryMethod.getNamedQueryName();
-
-			if (namedQueries.hasQuery(namedQueryName)) {
-				String namedQuery = namedQueries.getQuery(namedQueryName);
-				return new ElasticsearchStringQuery(queryMethod, elasticsearchOperations, namedQuery);
-			} else if (queryMethod.hasAnnotatedQuery()) {
-				return new ElasticsearchStringQuery(queryMethod, elasticsearchOperations, queryMethod.getAnnotatedQuery());
-			}
-			return new ElasticsearchPartQuery(queryMethod, elasticsearchOperations);
-		}
-	}
-}
+/*
+ * Copyright 2013-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.support;
+
+import static org.springframework.data.querydsl.QuerydslUtils.*;
+
+import java.lang.reflect.Method;
+import java.util.Optional;
+import java.util.UUID;
+
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+import org.springframework.data.elasticsearch.repository.query.ElasticsearchPartQuery;
+import org.springframework.data.elasticsearch.repository.query.ElasticsearchQueryMethod;
+import org.springframework.data.elasticsearch.repository.query.ElasticsearchStringQuery;
+import org.springframework.data.projection.ProjectionFactory;
+import org.springframework.data.querydsl.QuerydslPredicateExecutor;
+import org.springframework.data.repository.core.NamedQueries;
+import org.springframework.data.repository.core.RepositoryInformation;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.core.support.RepositoryFactorySupport;
+import org.springframework.data.repository.query.EvaluationContextProvider;
+import org.springframework.data.repository.query.QueryLookupStrategy;
+import org.springframework.data.repository.query.QueryLookupStrategy.Key;
+import org.springframework.data.repository.query.RepositoryQuery;
+import org.springframework.util.Assert;
+
+/**
+ * Factory to create {@link ElasticsearchRepository}
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Ryan Henszey
+ * @author Gad Akuka
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ */
+public class ElasticsearchRepositoryFactory extends RepositoryFactorySupport {
+
+	private final ElasticsearchOperations elasticsearchOperations;
+	private final ElasticsearchEntityInformationCreator entityInformationCreator;
+
+	public ElasticsearchRepositoryFactory(ElasticsearchOperations elasticsearchOperations) {
+
+		Assert.notNull(elasticsearchOperations, "ElasticsearchOperations must not be null!");
+
+		this.elasticsearchOperations = elasticsearchOperations;
+		this.entityInformationCreator = new ElasticsearchEntityInformationCreatorImpl(
+				elasticsearchOperations.getElasticsearchConverter().getMappingContext());
+	}
+
+	@Override
+	public <T, ID> ElasticsearchEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
+		return entityInformationCreator.getEntityInformation(domainClass);
+	}
+
+	@Override
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	protected Object getTargetRepository(RepositoryInformation metadata) {
+		return getTargetRepositoryViaReflection(metadata, getEntityInformation(metadata.getDomainType()),
+				elasticsearchOperations);
+	}
+
+	@Override
+	protected Class<?> getRepositoryBaseClass(RepositoryMetadata metadata) {
+		if (isQueryDslRepository(metadata.getRepositoryInterface())) {
+			throw new IllegalArgumentException("QueryDsl Support has not been implemented yet.");
+		}
+		if (Integer.class.isAssignableFrom(metadata.getIdType()) || Long.class.isAssignableFrom(metadata.getIdType())
+				|| Double.class.isAssignableFrom(metadata.getIdType())) {
+			return NumberKeyedRepository.class;
+		} else if (metadata.getIdType() == String.class) {
+			return SimpleElasticsearchRepository.class;
+		} else if (metadata.getIdType() == UUID.class) {
+			return UUIDElasticsearchRepository.class;
+		} else {
+			throw new IllegalArgumentException("Unsupported ID type " + metadata.getIdType());
+		}
+	}
+
+	private static boolean isQueryDslRepository(Class<?> repositoryInterface) {
+		return QUERY_DSL_PRESENT && QuerydslPredicateExecutor.class.isAssignableFrom(repositoryInterface);
+	}
+
+	@Override
+	protected Optional<QueryLookupStrategy> getQueryLookupStrategy(Key key,
+			EvaluationContextProvider evaluationContextProvider) {
+		return Optional.of(new ElasticsearchQueryLookupStrategy());
+	}
+
+	private class ElasticsearchQueryLookupStrategy implements QueryLookupStrategy {
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.repository.query.QueryLookupStrategy#resolveQuery(java.lang.reflect.Method, org.springframework.data.repository.core.RepositoryMetadata, org.springframework.data.projection.ProjectionFactory, org.springframework.data.repository.core.NamedQueries)
+		 */
+		@Override
+		public RepositoryQuery resolveQuery(Method method, RepositoryMetadata metadata, ProjectionFactory factory,
+				NamedQueries namedQueries) {
+
+			ElasticsearchQueryMethod queryMethod = new ElasticsearchQueryMethod(method, metadata, factory);
+			String namedQueryName = queryMethod.getNamedQueryName();
+
+			if (namedQueries.hasQuery(namedQueryName)) {
+				String namedQuery = namedQueries.getQuery(namedQueryName);
+				return new ElasticsearchStringQuery(queryMethod, elasticsearchOperations, namedQuery);
+			} else if (queryMethod.hasAnnotatedQuery()) {
+				return new ElasticsearchStringQuery(queryMethod, elasticsearchOperations, queryMethod.getAnnotatedQuery());
+			}
+			return new ElasticsearchPartQuery(queryMethod, elasticsearchOperations);
+		}
+	}
+}

src/main/java/org/springframework/data/elasticsearch/repository/support/ElasticsearchRepositoryFactoryBean.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,19 +29,31 @@ import org.springframework.util.Assert;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
+ * @author Mark Paluch
  */
 public class ElasticsearchRepositoryFactoryBean<T extends Repository<S, ID>, S, ID extends Serializable> extends
 		RepositoryFactoryBeanSupport<T, S, ID> {
 
 	private ElasticsearchOperations operations;
 
+	/**
+	 * Creates a new {@link ElasticsearchRepositoryFactoryBean} for the given repository interface.
+	 * 
+	 * @param repositoryInterface must not be {@literal null}.
+	 */
+	public ElasticsearchRepositoryFactoryBean(Class<? extends T> repositoryInterface) {
+		super(repositoryInterface);
+	}
+
 	/**
 	 * Configures the {@link ElasticsearchOperations} to be used to create Elasticsearch repositories.
 	 *
 	 * @param operations the operations to set
 	 */
 	public void setElasticsearchOperations(ElasticsearchOperations operations) {
-		Assert.notNull(operations);
+		
+		Assert.notNull(operations, "ElasticsearchOperations must not be null!");
+		
 		setMappingContext(operations.getElasticsearchConverter().getMappingContext());
 		this.operations = operations;
 	}

src/main/java/org/springframework/data/elasticsearch/repository/support/MappingElasticsearchEntityInformation.java

@@ -1,101 +1,94 @@
-/*
- * Copyright 2013-2015 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.repository.support;
-
-import java.io.Serializable;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
-import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
-import org.springframework.data.repository.core.support.PersistentEntityInformation;
-import org.springframework.util.Assert;
-
-/**
- * Elasticsearch specific implementation of
- * {@link org.springframework.data.repository.core.support.AbstractEntityInformation}
- *
- * @param <T>
- * @param <ID>
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Ryan Henszey
- * @author Oliver Gierke
- */
-public class MappingElasticsearchEntityInformation<T, ID extends Serializable> extends PersistentEntityInformation<T, ID>
-		implements ElasticsearchEntityInformation<T, ID> {
-
-	private static final Logger logger = LoggerFactory.getLogger(MappingElasticsearchEntityInformation.class);
-	private final ElasticsearchPersistentEntity<T> entityMetadata;
-	private final String indexName;
-	private final String type;
-
-	public MappingElasticsearchEntityInformation(ElasticsearchPersistentEntity<T> entity) {
-		this(entity, null, null);
-	}
-
-	public MappingElasticsearchEntityInformation(ElasticsearchPersistentEntity<T> entity, String indexName, String type) {
-		super(entity);
-		this.entityMetadata = entity;
-		this.indexName = indexName;
-		this.type = type;
-	}
-
-
-	@Override
-	public String getIdAttribute() {
-		Assert.notNull(entityMetadata.getIdProperty(), "Unable to identify 'id' property in class "
-				+ entityMetadata.getType().getSimpleName()
-				+ ". Make sure the 'id' property is annotated with @Id or named as 'id' or 'documentId' ");
-		return entityMetadata.getIdProperty().getFieldName();
-	}
-
-	@Override
-	public String getIndexName() {
-		return indexName != null ? indexName : entityMetadata.getIndexName();
-	}
-
-	@Override
-	public String getType() {
-		return type != null ? type : entityMetadata.getIndexType();
-	}
-
-	@Override
-	public Long getVersion(T entity) {
-		ElasticsearchPersistentProperty versionProperty = entityMetadata.getVersionProperty();
-		try {
-			if (versionProperty != null) {
-				return (Long) entityMetadata.getPropertyAccessor(entity).getProperty(versionProperty);
-			}
-		} catch (Exception e) {
-			throw new IllegalStateException("failed to load version field", e);
-		}
-		return null;
-	}
-
-	@Override
-	public String getParentId(T entity) {
-		ElasticsearchPersistentProperty parentProperty = entityMetadata.getParentIdProperty();
-		try {
-			if (parentProperty != null) {
-				return (String) entityMetadata.getPropertyAccessor(entity).getProperty(parentProperty);
-			}
-		} catch (Exception e) {
-			throw new IllegalStateException("failed to load parent ID: " + e, e);
-		}
-		return null;
-	}
-}
+/*
+ * Copyright 2013-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.support;
+
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
+import org.springframework.data.repository.core.support.PersistentEntityInformation;
+import org.springframework.util.Assert;
+
+/**
+ * Elasticsearch specific implementation of
+ * {@link org.springframework.data.repository.core.support.AbstractEntityInformation}
+ *
+ * @param <T>
+ * @param <ID>
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Ryan Henszey
+ * @author Oliver Gierke
+ * @author Mark Paluch
+ * @author Christoph Strobl
+ */
+public class MappingElasticsearchEntityInformation<T, ID> extends PersistentEntityInformation<T, ID>
+		implements ElasticsearchEntityInformation<T, ID> {
+
+	private final ElasticsearchPersistentEntity<T> entityMetadata;
+	private final String indexName;
+	private final String type;
+
+	public MappingElasticsearchEntityInformation(ElasticsearchPersistentEntity<T> entity) {
+		this(entity, entity.getIndexName(), entity.getIndexType());
+	}
+
+	public MappingElasticsearchEntityInformation(ElasticsearchPersistentEntity<T> entity, String indexName, String type) {
+		super(entity);
+
+		Assert.notNull(indexName, "IndexName must not be null!");
+		Assert.notNull(type, "IndexType must not be null!");
+
+		this.entityMetadata = entity;
+		this.indexName = indexName;
+		this.type = type;
+	}
+
+	@Override
+	public String getIdAttribute() {
+		return entityMetadata.getRequiredIdProperty().getFieldName();
+	}
+
+	@Override
+	public String getIndexName() {
+		return indexName;
+	}
+
+	@Override
+	public String getType() {
+		return type;
+	}
+
+	@Override
+	public Long getVersion(T entity) {
+
+		ElasticsearchPersistentProperty versionProperty = entityMetadata.getVersionProperty();
+		try {
+			return versionProperty != null ? (Long) entityMetadata.getPropertyAccessor(entity).getProperty(versionProperty) : null;
+		} catch (Exception e) {
+			throw new IllegalStateException("failed to load version field", e);
+		}
+	}
+
+	@Override
+	public String getParentId(T entity) {
+
+		ElasticsearchPersistentProperty parentProperty = entityMetadata.getParentIdProperty();
+		try {
+			return parentProperty != null ? (String) entityMetadata.getPropertyAccessor(entity).getProperty(parentProperty) : null;
+		} catch (Exception e) {
+			throw new IllegalStateException("failed to load parent ID: " + e, e);
+		}
+	}
+}

src/main/java/org/springframework/data/elasticsearch/repository/support/UUIDElasticsearchRepository.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.support;
+
+import java.util.UUID;
+
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+
+/**
+ * Elasticsearch specific repository implementation. Likely to be used as target within
+ * {@link ElasticsearchRepositoryFactory}
+ *
+ * @author Gad Akuka
+ */
+public class UUIDElasticsearchRepository<T> extends AbstractElasticsearchRepository<T, UUID> {
+
+	public UUIDElasticsearchRepository() {
+		super();
+	}
+
+	public UUIDElasticsearchRepository(ElasticsearchEntityInformation<T, UUID> metadata,
+										 ElasticsearchOperations elasticsearchOperations) {
+		super(metadata, elasticsearchOperations);
+	}
+
+	public UUIDElasticsearchRepository(ElasticsearchOperations elasticsearchOperations) {
+		super(elasticsearchOperations);
+	}
+
+	@Override
+	protected String stringIdRepresentation(UUID id) {
+		return (id != null) ? id.toString() : null;
+	}
+}

src/main/resources/META-INF/spring.factories

@@ -0,0 +1 @@
+org.springframework.data.repository.core.support.RepositoryFactorySupport=org.springframework.data.elasticsearch.repository.support.ElasticsearchRepositoryFactory

src/main/resources/changelog.txt

@@ -1,6 +1,189 @@
 Spring Data Elasticsearch Changelog
 ===================================
 
+Changes in version 3.0.0.RELEASE (2017-10-02)
+---------------------------------------------
+* DATAES-397 - Add explicit automatic module name for Java 9.
+* DATAES-395 - Upgrade to OpenWebBeans 2.0.1.
+* DATAES-392 - Release 3.0 GA (Kay).
+
+
+Changes in version 3.0.0.RC3 (2017-09-11)
+-----------------------------------------
+* DATAES-376 - Release 3.0 RC3 (Kay).
+
+
+Changes in version 2.1.7.RELEASE (2017-09-11)
+---------------------------------------------
+* DATAES-378 - Release 2.1.7 (Ingalls SR7).
+
+
+Changes in version 2.1.6.RELEASE (2017-07-26)
+---------------------------------------------
+* DATAES-374 - Release 2.1.6 (Ingalls SR6).
+
+
+Changes in version 3.0.0.RC2 (2017-07-25)
+-----------------------------------------
+* DATAES-375 - Release 3.0 RC2 (Kay).
+
+
+Changes in version 3.0.0.RC1 (2017-07-25)
+-----------------------------------------
+* DATAES-373 - Update ES to 5.5.0.
+* DATAES-369 - Adapt to API changes in mapping subsystem.
+* DATAES-359 - Release 3.0 RC1 (Kay).
+* DATAES-274 - Jackson throws exception when deserializing Page.
+
+
+Changes in version 2.1.5.RELEASE (2017-07-24)
+---------------------------------------------
+* DATAES-358 - Release 2.1.5 (Ingalls SR5).
+
+
+Changes in version 3.0.0.M4 (2017-06-14)
+----------------------------------------
+* DATAES-353 - Release 3.0 M4 (Kay).
+* DATAES-334 - Readme has broken jira link.
+* DATAES-285 - Upgrade to Elasticsearch 5.0.
+
+
+Changes in version 2.1.4.RELEASE (2017-06-08)
+---------------------------------------------
+* DATAES-349 - Release 2.1.4 (Ingalls SR4).
+
+
+Changes in version 2.0.11.RELEASE (2017-06-07)
+----------------------------------------------
+* DATAES-348 - Release 2.0.11 (Hopper SR11).
+
+
+Changes in version 3.0.0.M3 (2017-05-09)
+----------------------------------------
+* DATAES-352 - Adapt to API changes in CrudRepository.
+* DATAES-350 - Adapt to moved CustomConversions to Spring Data Commons.
+* DATAES-344 - Release 3.0 M3 (Kay).
+
+
+Changes in version 2.0.10.RELEASE (2017-04-19)
+----------------------------------------------
+* DATAES-347 - Release 2.0.10 (Hopper SR10).
+
+
+Changes in version 2.1.3.RELEASE (2017-04-19)
+---------------------------------------------
+* DATAES-346 - Release 2.1.3 (Ingalls SR3).
+
+
+Changes in version 2.0.9.RELEASE (2017-04-19)
+---------------------------------------------
+* DATAES-336 - Release 2.0.9 (Hopper SR9).
+
+
+Changes in version 2.1.2.RELEASE (2017-04-19)
+---------------------------------------------
+* DATAES-335 - Release 2.1.2 (Ingalls SR2).
+
+
+Changes in version 3.0.0.M2 (2017-04-04)
+----------------------------------------
+* DATAES-342 - Adapt to API changes in RepositoryConfigurationExtensionSupport.
+* DATAES-329 - Remove references to single-argument assertion methods of Spring.
+* DATAES-328 - Integrate Data Commons Java 8 upgrade branch.
+* DATAES-325 - Remove references to GenericCollectionTypeResolver in favor of ResolvableType.
+* DATAES-322 - Update project documentation with the CLA tool integration.
+* DATAES-315 - Adapt API in RepositoryFactoryBeanSupport implementation.
+* DATAES-313 - Register repository factory in spring.factories for multi-store support.
+* DATAES-311 - Release 3.0 M2 (Kay).
+
+
+Changes in version 2.0.8.RELEASE (2017-03-02)
+---------------------------------------------
+* DATAES-329 - Remove references to single-argument assertion methods of Spring.
+* DATAES-326 - Release 2.0.8 (Hopper SR8).
+
+
+Changes in version 2.1.1.RELEASE (2017-03-02)
+---------------------------------------------
+* DATAES-329 - Remove references to single-argument assertion methods of Spring.
+* DATAES-327 - Release 2.1.1 (Ingalls SR1).
+* DATAES-325 - Remove references to GenericCollectionTypeResolver in favor of ResolvableType.
+
+
+Changes in version 2.0.7.RELEASE (2017-01-26)
+---------------------------------------------
+* DATAES-319 - Release 2.0.7 (Hopper SR7).
+
+
+Changes in version 2.1.0.RELEASE (2017-01-26)
+---------------------------------------------
+* DATAES-322 - Update project documentation with the CLA tool integration.
+* DATAES-320 - Release 2.1 GA (Ingalls).
+
+
+Changes in version 2.0.6.RELEASE (2016-12-21)
+---------------------------------------------
+* DATAES-304 - Release 2.0.6 (Hopper SR6).
+
+
+Changes in version 2.1.0.RC1 (2016-12-21)
+-----------------------------------------
+* DATAES-315 - Adapt API in RepositoryFactoryBeanSupport implementation.
+* DATAES-313 - Register repository factory in spring.factories for multi-store support.
+* DATAES-289 - Upgrade to Elasticsearch 2.4.
+* DATAES-284 - Downgrade to Jackson 2.7.5 until Elasticsearch is compatible with 2.8.
+* DATAES-281 - Can't save entity without id setter.
+* DATAES-275 - Release 2.1 RC1 (Ingalls).
+
+
+Changes in version 3.0.0.M1 (2016-11-23)
+----------------------------------------
+* DATAES-307 - Set up 3.0 development.
+* DATAES-306 - Release 3.0 M1 (Kay).
+
+
+Changes in version 2.0.5.RELEASE (2016-11-03)
+---------------------------------------------
+* DATAES-300 - Release 2.0.5 (Hopper SR5).
+
+
+Changes in version 2.0.4.RELEASE (2016-09-29)
+---------------------------------------------
+* DATAES-297 - Release 2.0.4 (Hopper SR4).
+
+
+Changes in version 1.3.6.RELEASE (2016-09-29)
+---------------------------------------------
+* DATAES-299 - Release 1.3.6 (Gosling SR6).
+
+
+Changes in version 1.3.5.RELEASE (2016-09-20)
+---------------------------------------------
+* DATAES-296 - Release 1.3.5 (Gosling SR5).
+
+
+Changes in version 2.0.3.RELEASE (2016-09-20)
+---------------------------------------------
+* DATAES-281 - Can't save entity without id setter.
+* DATAES-268 - Release 2.0.3 (Hopper SR3).
+
+
+Changes in version 2.1.0.M1 (2016-07-27)
+----------------------------------------
+* DATAES-262 - Upgrade Elasticsearch to 2.3.3.
+* DATAES-250 - Release 2.1 M1 (Ingalls).
+
+
+Changes in version 2.0.2.RELEASE (2016-06-15)
+---------------------------------------------
+* DATAES-251 - Release 2.0.2 (Hopper SR2).
+
+
+Changes in version 2.0.1.RELEASE (2016-04-06)
+---------------------------------------------
+* DATAES-249 - Release 2.0.1 (Hopper SR1).
+
+
 Changes in version 2.0.0.RELEASE (2016-04-06)
 ---------------------------------------------
 * DATAES-245 - Release 2.0 GA (Hopper).

src/main/resources/log4j2.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+        </Console>
+    </Appenders>
+    <Loggers>
+        <Root level="error">
+            <AppenderRef ref="Console"/>
+        </Root>
+    </Loggers>
+</Configuration>

src/main/resources/notice.txt

@@ -1,4 +1,4 @@
-Spring Data Elasticsearch 2.0 GA
+Spring Data Elasticsearch 3.0 GA
 Copyright (c) [2013-2016] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").

src/test/java/org/springframework/data/elasticsearch/InnerObjectTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,9 @@ import static org.apache.commons.lang.RandomStringUtils.*;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
+import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,17 +35,16 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Mohsin Husen
+ * @author Christoph Strobl
  */
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:/repository-test-nested-object.xml")
+@ContextConfiguration("classpath:/repository-test-nested-object-books.xml")
 public class InnerObjectTests {
 
-	@Autowired
-	private SampleElasticSearchBookRepository bookRepository;
+	@Autowired private SampleElasticSearchBookRepository bookRepository;
 
-	@Autowired
-	private ElasticsearchTemplate elasticsearchTemplate;
+	@Autowired private ElasticsearchTemplate elasticsearchTemplate;
 
 	@Before
 	public void before() {
@@ -67,6 +68,6 @@ public class InnerObjectTests {
 		// when
 		bookRepository.save(book);
 		// then
-		assertThat(bookRepository.findOne(id), is(notNullValue()));
+		assertThat(bookRepository.findById(id), is(notNullValue()));
 	}
 }

src/test/java/org/springframework/data/elasticsearch/NestedObjectTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,13 +15,11 @@
  */
 package org.springframework.data.elasticsearch;
 
-import static org.apache.commons.lang.RandomStringUtils.randomNumeric;
-import static org.elasticsearch.index.query.QueryBuilders.boolQuery;
-import static org.elasticsearch.index.query.QueryBuilders.nestedQuery;
-import static org.elasticsearch.index.query.QueryBuilders.termQuery;
+import static org.apache.commons.lang.RandomStringUtils.*;
+import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -30,6 +28,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.junit.Before;
@@ -48,7 +47,6 @@ import org.springframework.data.elasticsearch.entities.Car;
 import org.springframework.data.elasticsearch.entities.GirlFriend;
 import org.springframework.data.elasticsearch.entities.Person;
 import org.springframework.data.elasticsearch.entities.PersonMultipleLevelNested;
-import org.springframework.data.geo.Point;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
@@ -84,7 +82,7 @@ public class NestedObjectTests {
 	@Test
 	public void shouldIndexInitialLevelNestedObject() {
 
-		final List<Car> cars = new ArrayList<Car>();
+		final List<Car> cars = new ArrayList<>();
 
 		final Car saturn = new Car();
 		saturn.setName("Saturn");
@@ -116,7 +114,7 @@ public class NestedObjectTests {
 		bar.setName("Bar");
 		bar.setCar(Arrays.asList(car));
 
-		final List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		final List<IndexQuery> indexQueries = new ArrayList<>();
 		final IndexQuery indexQuery1 = new IndexQuery();
 		indexQuery1.setId(foo.getId());
 		indexQuery1.setObject(foo);
@@ -132,7 +130,7 @@ public class NestedObjectTests {
 		elasticsearchTemplate.bulkIndex(indexQueries);
 		elasticsearchTemplate.refresh(Person.class);
 
-		final QueryBuilder builder = nestedQuery("car", boolQuery().must(termQuery("car.name", "saturn")).must(termQuery("car.model", "imprezza")));
+		final QueryBuilder builder = nestedQuery("car", boolQuery().must(termQuery("car.name", "saturn")).must(termQuery("car.model", "imprezza")), ScoreMode.None);
 
 		final SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(builder).build();
 		final List<Person> persons = elasticsearchTemplate.queryForList(searchQuery, Person.class);
@@ -165,7 +163,7 @@ public class NestedObjectTests {
 		//when
 		elasticsearchTemplate.putMapping(PersonMultipleLevelNested.class);
 		elasticsearchTemplate.bulkIndex(indexQueries);
-		// then 
+		// then
 
 		final Map mapping = elasticsearchTemplate.getMapping(PersonMultipleLevelNested.class);
 
@@ -189,8 +187,8 @@ public class NestedObjectTests {
 
 		//then
 		final BoolQueryBuilder builder = boolQuery();
-		builder.must(nestedQuery("girlFriends", termQuery("girlFriends.type", "temp")))
-				.must(nestedQuery("girlFriends.cars", termQuery("girlFriends.cars.name", "Ford".toLowerCase())));
+		builder.must(nestedQuery("girlFriends", termQuery("girlFriends.type", "temp"),ScoreMode.None))
+				.must(nestedQuery("girlFriends.cars", termQuery("girlFriends.cars.name", "Ford".toLowerCase()),ScoreMode.None));
 
 		final SearchQuery searchQuery = new NativeSearchQueryBuilder()
 				.withQuery(builder)
@@ -253,7 +251,7 @@ public class NestedObjectTests {
 		indexQuery2.setId(person2.getId());
 		indexQuery2.setObject(person2);
 
-		final List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		final List<IndexQuery> indexQueries = new ArrayList<>();
 		indexQueries.add(indexQuery1);
 		indexQueries.add(indexQuery2);
 
@@ -263,7 +261,7 @@ public class NestedObjectTests {
 	@Test
 	public void shouldSearchBooksForPersonInitialLevelNestedType() {
 
-		final List<Car> cars = new ArrayList<Car>();
+		final List<Car> cars = new ArrayList<>();
 
 		final Car saturn = new Car();
 		saturn.setName("Saturn");
@@ -312,7 +310,7 @@ public class NestedObjectTests {
 		bar.setName("Bar");
 		bar.setCar(Arrays.asList(car));
 
-		final List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		final List<IndexQuery> indexQueries = new ArrayList<>();
 		final IndexQuery indexQuery1 = new IndexQuery();
 		indexQuery1.setId(foo.getId());
 		indexQuery1.setObject(foo);
@@ -328,7 +326,7 @@ public class NestedObjectTests {
 		elasticsearchTemplate.bulkIndex(indexQueries);
 		elasticsearchTemplate.refresh(Person.class);
 
-		final QueryBuilder builder = nestedQuery("books", boolQuery().must(termQuery("books.name", "java")));
+		final QueryBuilder builder = nestedQuery("books", boolQuery().must(termQuery("books.name", "java")), ScoreMode.None);
 
 		final SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(builder).build();
 		final List<Person> persons = elasticsearchTemplate.queryForList(searchQuery, Person.class);
@@ -351,16 +349,16 @@ public class NestedObjectTests {
 		book2.setId(randomNumeric(5));
 		book2.setName("testBook2");
 
-		final Map<Integer, Collection<String>> map1 = new HashMap<Integer, Collection<String>>();
+		final Map<Integer, Collection<String>> map1 = new HashMap<>();
 		map1.put(1, Arrays.asList("test1", "test2"));
 
-		final Map<Integer, Collection<String>> map2 = new HashMap<Integer, Collection<String>>();
+		final Map<Integer, Collection<String>> map2 = new HashMap<>();
 		map2.put(1, Arrays.asList("test3", "test4"));
 
 		book1.setBuckets(map1);
 		book2.setBuckets(map2);
 
-		final List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		final List<IndexQuery> indexQueries = new ArrayList<>();
 		final IndexQuery indexQuery1 = new IndexQuery();
 		indexQuery1.setId(book1.getId());
 		indexQuery1.setObject(book1);
@@ -376,7 +374,7 @@ public class NestedObjectTests {
 		elasticsearchTemplate.refresh(Book.class);
 		//then
 		final SearchQuery searchQuery = new NativeSearchQueryBuilder()
-				.withQuery(nestedQuery("buckets", termQuery("buckets.1", "test3")))
+				.withQuery(nestedQuery("buckets", termQuery("buckets.1", "test3"),ScoreMode.None))
 				.build();
 		final Page<Book> books = elasticsearchTemplate.queryForPage(searchQuery, Book.class);
 

src/test/java/org/springframework/data/elasticsearch/SampleEntity.java

@@ -1,139 +0,0 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch;
-
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.annotation.Version;
-import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.ScriptedField;
-
-/**
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-@Document(indexName = "test-index", type = "test-type", shards = 1, replicas = 0, refreshInterval = "-1")
-public class SampleEntity {
-
-	@Id
-	private String id;
-	private String type;
-	private String message;
-	private int rate;
-    @ScriptedField
-    private Long scriptedRate;
-	private boolean available;
-	private String highlightedMessage;
-	@Version
-	private Long version;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getMessage() {
-		return message;
-	}
-
-	public void setMessage(String message) {
-		this.message = message;
-	}
-
-	public int getRate() {
-		return rate;
-	}
-
-	public void setRate(int rate) {
-		this.rate = rate;
-	}
-
-    public Long getScriptedRate() {
-        return scriptedRate;
-    }
-
-    public void setScriptedRate(Long scriptedRate) {
-        this.scriptedRate = scriptedRate;
-    }
-
-	public boolean isAvailable() {
-		return available;
-	}
-
-	public void setAvailable(boolean available) {
-		this.available = available;
-	}
-
-	public String getHighlightedMessage() {
-		return highlightedMessage;
-	}
-
-	public void setHighlightedMessage(String highlightedMessage) {
-		this.highlightedMessage = highlightedMessage;
-	}
-
-	public Long getVersion() {
-		return version;
-	}
-
-	public void setVersion(Long version) {
-		this.version = version;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (!(obj instanceof SampleEntity)) {
-			return false;
-		}
-		if (this == obj) {
-			return true;
-		}
-		SampleEntity rhs = (SampleEntity) obj;
-		return new EqualsBuilder().append(this.id, rhs.id).append(this.type, rhs.type).append(this.message, rhs.message)
-				.append(this.rate, rhs.rate).append(this.available, rhs.available).append(this.version, rhs.version).isEquals();
-	}
-
-	@Override
-	public int hashCode() {
-		return new HashCodeBuilder().append(id).append(type).append(message).append(rate).append(available).append(version)
-				.toHashCode();
-	}
-
-	@Override
-	public String toString() {
-		return "SampleEntity{" +
-				"id='" + id + '\'' +
-				", type='" + type + '\'' +
-				", message='" + message + '\'' +
-				", rate=" + rate +
-				", available=" + available +
-				", highlightedMessage='" + highlightedMessage + '\'' +
-				", version=" + version +
-				'}';
-	}
-}

src/test/java/org/springframework/data/elasticsearch/Utils.java

@@ -15,24 +15,36 @@
  */
 package org.springframework.data.elasticsearch;
 
-import static org.elasticsearch.node.NodeBuilder.*;
-
 import java.util.UUID;
-
-import org.elasticsearch.client.node.NodeClient;
+import org.elasticsearch.client.Client;
 import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.node.NodeValidationException;
+import org.elasticsearch.transport.Netty4Plugin;
+import org.springframework.data.elasticsearch.client.NodeClientFactoryBean;
+import static java.util.Arrays.*;
 
 /**
  * @author Mohsin Husen
+ * @author Artur Konczak
  */
 public class Utils {
 
-	public static NodeClient getNodeClient() {
-		return (NodeClient) nodeBuilder().settings(Settings.builder()
-				.put("http.enabled", "false")
-				.put("path.data", "target/elasticsearchTestData")
-				.put("path.home", "src/test/resources/test-home-dir"))
-				.clusterName(UUID.randomUUID().toString()).local(true).node()
-				.client();
+	public static Client getNodeClient() throws NodeValidationException {
+
+		String pathHome = "src/test/resources/test-home-dir";
+		String pathData = "target/elasticsearchTestData";
+		String clusterName = UUID.randomUUID().toString();
+
+		return new NodeClientFactoryBean.TestNode(
+				Settings.builder()
+						.put("transport.type", "netty4")
+						.put("transport.type", "local")
+						.put("http.type", "netty4")
+						.put("path.home", pathHome)
+						.put("path.data", pathData)
+						.put("cluster.name", clusterName)
+						.put("node.max_local_storage_nodes", 100)
+						.put("script.inline", "true")
+						.build(), asList(Netty4Plugin.class)).start().client();
 	}
 }

src/test/java/org/springframework/data/elasticsearch/config/ElasticsearchNamespaceHandlerTests.java

@@ -23,7 +23,6 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
-import org.springframework.data.elasticsearch.client.NodeClientFactoryBean;
 import org.springframework.data.elasticsearch.client.TransportClientFactoryBean;
 import org.springframework.data.elasticsearch.repositories.sample.SampleElasticsearchRepository;
 import org.springframework.test.context.ContextConfiguration;
@@ -41,12 +40,6 @@ public class ElasticsearchNamespaceHandlerTests {
 	@Autowired
 	private ApplicationContext context;
 
-	@Test
-	public void shouldCreatesNodeClient() {
-		assertThat(context.getBean(NodeClientFactoryBean.class), is(notNullValue()));
-		assertThat(context.getBean(NodeClientFactoryBean.class), is(instanceOf(NodeClientFactoryBean.class)));
-	}
-
 	@Test
 	public void shouldCreateTransportClient() {
 		assertThat(context.getBean(TransportClientFactoryBean.class), is(notNullValue()));

src/test/java/org/springframework/data/elasticsearch/config/EnableElasticsearchRepositoriesTests.java

@@ -1,96 +1,101 @@
-/*
- * Copyright 2013-15 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.config;
-
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.elasticsearch.Utils;
-import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
-import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
-import org.springframework.data.elasticsearch.entities.SampleEntity;
-import org.springframework.data.elasticsearch.repositories.sample.SampleElasticsearchRepository;
-import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
-import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
-import org.springframework.data.repository.Repository;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-/**
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Kevin Leturc
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration
-public class EnableElasticsearchRepositoriesTests implements ApplicationContextAware {
-
-	ApplicationContext context;
-
-	@Override
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		this.context = applicationContext;
-	}
-
-	@Configuration
-	@EnableElasticsearchRepositories(basePackages = {"org.springframework.data.elasticsearch.repositories.sample",
-			"org.springframework.data.elasticsearch.config"})
-	static class Config {
-
-		@Bean
-		public ElasticsearchOperations elasticsearchTemplate() {
-			return new ElasticsearchTemplate(Utils.getNodeClient());
-		}
-	}
-
-	@Autowired
-	private SampleElasticsearchRepository repository;
-
-	@Autowired(required = false)
-	private SampleRepository nestedRepository;
-
-	interface SampleRepository extends Repository<SampleEntity, Long> {};
-
-	@Test
-	public void bootstrapsRepository() {
-		assertThat(repository, is(notNullValue()));
-	}
-
-	@Test
-	public void shouldScanSelectedPackage() {
-		//given
-
-		//when
-		String[] beanNamesForType = context.getBeanNamesForType(ElasticsearchRepository.class);
-
-		//then
-		assertThat(beanNamesForType.length, is(1));
-		assertThat(beanNamesForType[0], is("sampleElasticsearchRepository"));
-	}
-
-	@Test
-	public void hasNotNestedRepository() {
-		assertNull(nestedRepository);
-	}
-}
+/*
+ * Copyright 2013-15 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.config;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+
+import java.util.Arrays;
+
+import org.elasticsearch.node.NodeValidationException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.elasticsearch.Utils;
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
+import org.springframework.data.elasticsearch.entities.SampleEntity;
+import org.springframework.data.elasticsearch.repositories.sample.SampleElasticsearchRepository;
+import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
+import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
+import org.springframework.data.repository.Repository;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Kevin Leturc
+ * @author Gad Akuka
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration
+public class EnableElasticsearchRepositoriesTests implements ApplicationContextAware {
+
+	ApplicationContext context;
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		this.context = applicationContext;
+	}
+
+	@Configuration
+	@EnableElasticsearchRepositories(basePackages = {"org.springframework.data.elasticsearch.repositories.sample",
+			"org.springframework.data.elasticsearch.config"})
+	static class Config {
+
+		@Bean
+		public ElasticsearchOperations elasticsearchTemplate() throws NodeValidationException {
+			return new ElasticsearchTemplate(Utils.getNodeClient());
+		}
+	}
+
+	@Autowired
+	private SampleElasticsearchRepository repository;
+
+	@Autowired(required = false)
+	private SampleRepository nestedRepository;
+
+	interface SampleRepository extends Repository<SampleEntity, Long> {};
+
+	@Test
+	public void bootstrapsRepository() {
+		assertThat(repository, is(notNullValue()));
+	}
+
+	@Test
+	public void shouldScanSelectedPackage() {
+		//given
+
+		//when
+		String[] beanNamesForType = context.getBeanNamesForType(ElasticsearchRepository.class);
+
+		//then
+		assertThat(beanNamesForType.length, is(2));
+		assertTrue(Arrays.asList(beanNamesForType).contains("sampleElasticsearchRepository"));
+		assertTrue(Arrays.asList(beanNamesForType).contains("sampleUUIDKeyedElasticsearchRepository"));
+	}
+
+	@Test
+	public void hasNotNestedRepository() {
+		assertNull(nestedRepository);
+	}
+}

src/test/java/org/springframework/data/elasticsearch/config/EnableNestedElasticsearchRepositoriesTests.java

@@ -15,6 +15,9 @@
  */
 package org.springframework.data.elasticsearch.config;
 
+import static org.junit.Assert.*;
+
+import org.elasticsearch.node.NodeValidationException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -29,8 +32,6 @@ import org.springframework.data.repository.Repository;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static org.junit.Assert.assertNotNull;
-
 /**
  * @author Kevin Leturc
  */
@@ -44,7 +45,7 @@ public class EnableNestedElasticsearchRepositoriesTests {
 	static class Config {
 
 		@Bean
-		public ElasticsearchOperations elasticsearchTemplate() {
+		public ElasticsearchOperations elasticsearchTemplate() throws NodeValidationException {
 			return new ElasticsearchTemplate(Utils.getNodeClient());
 		}
 	}

src/test/java/org/springframework/data/elasticsearch/core/AliasTests.java

@@ -1,5 +1,5 @@
 /*
-* Copyright 2014-2016 the original author or authors.
+* Copyright 2014-2017 the original author or authors.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,15 +19,22 @@ import static org.apache.commons.lang.RandomStringUtils.*;
 import static org.elasticsearch.index.query.QueryBuilders.*;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.elasticsearch.cluster.metadata.AliasMetaData;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.elasticsearch.core.query.*;
+import org.springframework.data.elasticsearch.core.query.AliasBuilder;
+import org.springframework.data.elasticsearch.core.query.AliasQuery;
+import org.springframework.data.elasticsearch.core.query.IndexQuery;
+import org.springframework.data.elasticsearch.core.query.IndexQueryBuilder;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
+import org.springframework.data.elasticsearch.core.query.SearchQuery;
 import org.springframework.data.elasticsearch.entities.SampleEntity;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@@ -48,7 +55,7 @@ public class AliasTests {
 
 	@Before
 	public void before() {
-		Map<String, Object> settings = new HashMap<String, Object>();
+		Map<String, Object> settings = new HashMap<>();
 		settings.put("index.refresh_interval", "-1");
 		settings.put("index.number_of_replicas", "0");
 		settings.put("index.number_of_shards", "2");

src/test/java/org/springframework/data/elasticsearch/core/CustomEntityMapper.java

@@ -29,13 +29,13 @@ public class CustomEntityMapper implements EntityMapper {
 
 	@Override
 	public String mapToString(Object object) throws IOException {
-		//mapping Object to String
+		//mapping Object to text
 		return null;
 	}
 
 	@Override
 	public <T> T mapToObject(String source, Class<T> clazz) throws IOException {
-		//mapping String to Object
+		//mapping text to Object
 		return null;
 	}
 }

src/test/java/org/springframework/data/elasticsearch/core/CustomResultMapper.java

@@ -20,8 +20,8 @@ import java.util.LinkedList;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.get.MultiGetResponse;
 import org.elasticsearch.action.search.SearchResponse;
-import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
 
 /**
  * @author Artur Konczak
@@ -47,7 +47,7 @@ public class CustomResultMapper implements ResultsMapper {
 	}
 
 	@Override
-	public <T> Page<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
+	public <T> AggregatedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
 		return null;  //To change body of implemented methods use File | Settings | File Templates.
 	}
 

src/test/java/org/springframework/data/elasticsearch/core/DefaultResultMapperTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,31 +15,42 @@
  */
 package org.springframework.data.elasticsearch.core;
 
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.Map;
-
 import com.fasterxml.jackson.databind.util.ArrayIterator;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.SearchHitField;
 import org.elasticsearch.search.SearchHits;
-import org.elasticsearch.search.internal.InternalSearchHitField;
+import org.elasticsearch.search.aggregations.Aggregation;
+import org.elasticsearch.search.aggregations.Aggregations;
+import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
+import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
 import org.springframework.data.elasticsearch.entities.Car;
 
+import static java.util.Arrays.asList;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
 /**
  * @author Artur Konczak
  * @author Mohsin Husen
+ * @author Mark Paluch
  */
 public class DefaultResultMapperTests {
 
@@ -51,7 +62,28 @@ public class DefaultResultMapperTests {
 	@Before
 	public void init() {
 		MockitoAnnotations.initMocks(this);
-		resultMapper = new DefaultResultMapper();
+		resultMapper = new DefaultResultMapper(new SimpleElasticsearchMappingContext());
+	}
+
+	@Test
+	public void shouldMapAggregationsToPage() {
+		//Given
+		SearchHit[] hits = {createCarHit("Ford", "Grat"), createCarHit("BMW", "Arrow")};
+		SearchHits searchHits = mock(SearchHits.class);
+		when(searchHits.totalHits()).thenReturn(2L);
+		when(searchHits.iterator()).thenReturn(new ArrayIterator(hits));
+		when(response.getHits()).thenReturn(searchHits);
+
+		Aggregations aggregations = new Aggregations(asList(createCarAggregation()));
+		when(response.getAggregations()).thenReturn(aggregations);
+
+		//When
+		AggregatedPage<Car> page = (AggregatedPage<Car>) resultMapper.mapResults(response, Car.class, Pageable.unpaged());
+
+		//Then
+		page.hasFacets();
+		assertThat(page.hasAggregations(), is(true));
+		assertThat(page.getAggregation("Diesel").getName(), is("Diesel"));
 	}
 
 	@Test
@@ -64,7 +96,7 @@ public class DefaultResultMapperTests {
 		when(response.getHits()).thenReturn(searchHits);
 
 		//When
-		Page<Car> page = resultMapper.mapResults(response, Car.class, null);
+		Page<Car> page = resultMapper.mapResults(response, Car.class, Pageable.unpaged());
 
 		//Then
 		assertThat(page.hasContent(), is(true));
@@ -82,7 +114,7 @@ public class DefaultResultMapperTests {
 		when(response.getHits()).thenReturn(searchHits);
 
 		//When
-		Page<Car> page = resultMapper.mapResults(response, Car.class, null);
+		Page<Car> page = resultMapper.mapResults(response, Car.class, Pageable.unpaged());
 
 		//Then
 		assertThat(page.hasContent(), is(true));
@@ -105,6 +137,28 @@ public class DefaultResultMapperTests {
 		assertThat(result.getName(), is("Ford"));
 	}
 
+	/**
+	 * @see DATAES-281.
+	 */
+	@Test
+	public void setsIdentifierOnImmutableType() {
+
+		GetResponse response = mock(GetResponse.class);
+		when(response.getSourceAsString()).thenReturn("{}");
+		when(response.getId()).thenReturn("identifier");
+
+		ImmutableEntity result = resultMapper.mapResult(response, ImmutableEntity.class);
+
+		assertThat(result, is(notNullValue()));
+		assertThat(result.getId(), is("identifier"));
+	}
+
+	private Aggregation createCarAggregation() {
+		Aggregation aggregation = mock(Terms.class);
+		when(aggregation.getName()).thenReturn("Diesel");
+		return aggregation;
+	}
+
 	private SearchHit createCarHit(String name, String model) {
 		SearchHit hit = mock(SearchHit.class);
 		when(hit.sourceAsString()).thenReturn(createJsonCar(name, model));
@@ -127,9 +181,17 @@ public class DefaultResultMapperTests {
 	}
 
 	private Map<String, SearchHitField> createCarFields(String name, String model) {
-		Map<String, SearchHitField> result = new HashMap<String, SearchHitField>();
-		result.put("name", new InternalSearchHitField("name", Arrays.<Object>asList(name)));
-		result.put("model", new InternalSearchHitField("model", Arrays.<Object>asList(model)));
+		Map<String, SearchHitField> result = new HashMap<>();
+		result.put("name", new SearchHitField("name", asList(name)));
+		result.put("model", new SearchHitField("model", asList(model)));
 		return result;
 	}
+
+	@Document(indexName = "test-index-immutable-internal")
+	@NoArgsConstructor(force = true)
+	@Getter
+	static class ImmutableEntity {
+
+		private final String id, name;
+	}
 }

src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateParentChildTests.java

@@ -15,13 +15,14 @@
  */
 package org.springframework.data.elasticsearch.core;
 
-import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
-import static org.elasticsearch.index.query.QueryBuilders.*;
+import static org.elasticsearch.common.xcontent.XContentFactory.*;
+import static org.elasticsearch.join.query.JoinQueryBuilders.hasChildQuery;
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 
 import java.util.List;
 
+import org.apache.lucene.search.join.ScoreMode;
 import org.elasticsearch.action.RoutingMissingException;
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.action.update.UpdateResponse;
@@ -80,7 +81,7 @@ public class ElasticsearchTemplateParentChildTests {
 		elasticsearchTemplate.refresh(ChildEntity.class);
 
 		// find all parents that have the first child
-		QueryBuilder query = hasChildQuery(ParentEntity.CHILD_TYPE, QueryBuilders.termQuery("name", child1name.toLowerCase()));
+		QueryBuilder query = hasChildQuery(ParentEntity.CHILD_TYPE, QueryBuilders.termQuery("name", child1name.toLowerCase()), ScoreMode.None);
 		List<ParentEntity> parents = elasticsearchTemplate.queryForList(new NativeSearchQuery(query), ParentEntity.class);
 
 		// we're expecting only the first parent as result

src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2016 the original author or authors.
+ * Copyright 2014-2017 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,14 @@
  */
 package org.springframework.data.elasticsearch.core;
 
-import static org.apache.commons.lang.RandomStringUtils.*;
-import static org.elasticsearch.index.query.QueryBuilders.*;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-import static org.springframework.data.elasticsearch.utils.IndexBuilder.*;
-
-import java.util.*;
-
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.action.get.MultiGetItemResponse;
 import org.elasticsearch.action.get.MultiGetResponse;
@@ -30,25 +30,38 @@ import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.index.engine.DocumentMissingException;
 import org.elasticsearch.script.Script;
-import org.elasticsearch.script.ScriptService;
+import org.elasticsearch.script.ScriptType;
 import org.elasticsearch.search.SearchHit;
-import org.elasticsearch.search.highlight.HighlightBuilder;
+import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
 import org.elasticsearch.search.sort.FieldSortBuilder;
 import org.elasticsearch.search.sort.SortOrder;
 import org.hamcrest.Matchers;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.*;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.elasticsearch.ElasticsearchException;
 import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
+import org.springframework.data.elasticsearch.core.aggregation.impl.AggregatedPageImpl;
 import org.springframework.data.elasticsearch.core.query.*;
-import org.springframework.data.elasticsearch.entities.*;
+import org.springframework.data.elasticsearch.entities.HetroEntity1;
+import org.springframework.data.elasticsearch.entities.HetroEntity2;
+import org.springframework.data.elasticsearch.entities.SampleEntity;
+import org.springframework.data.elasticsearch.entities.SampleMappingEntity;
+import org.springframework.data.elasticsearch.entities.UseServerConfigurationEntity;
 import org.springframework.data.util.CloseableIterator;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import static org.apache.commons.lang.RandomStringUtils.*;
+import static org.elasticsearch.index.query.QueryBuilders.*;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+import static org.springframework.data.elasticsearch.utils.IndexBuilder.*;
 
 /**
  * @author Rizwan Idrees
@@ -62,7 +75,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 @ContextConfiguration("classpath:elasticsearch-template-test.xml")
 public class ElasticsearchTemplateTests {
 
-	private static final String INDEX_NAME = "test-index";
+	private static final String INDEX_NAME = "test-index-sample";
 	private static final String INDEX_1_NAME = "test-index-1";
 	private static final String INDEX_2_NAME = "test-index-2";
 	private static final String TYPE_NAME = "test-type";
@@ -74,6 +87,7 @@ public class ElasticsearchTemplateTests {
 	public void before() {
 		elasticsearchTemplate.deleteIndex(SampleEntity.class);
 		elasticsearchTemplate.createIndex(SampleEntity.class);
+		elasticsearchTemplate.putMapping(SampleEntity.class);
 		elasticsearchTemplate.deleteIndex(INDEX_1_NAME);
 		elasticsearchTemplate.deleteIndex(INDEX_2_NAME);
 		elasticsearchTemplate.deleteIndex(UseServerConfigurationEntity.class);
@@ -137,7 +151,7 @@ public class ElasticsearchTemplateTests {
 	@Test
 	public void shouldReturnObjectsForGivenIdsUsingMultiGet() {
 		// given
-		List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		List<IndexQuery> indexQueries = new ArrayList<>();
 		// first document
 		String documentId = randomNumeric(5);
 		SampleEntity sampleEntity1 = SampleEntity.builder().id(documentId).message("some message")
@@ -165,7 +179,7 @@ public class ElasticsearchTemplateTests {
 	@Test
 	public void shouldReturnObjectsForGivenIdsUsingMultiGetWithFields() {
 		// given
-		List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		List<IndexQuery> indexQueries = new ArrayList<>();
 		// first document
 		String documentId = randomNumeric(5);
 		SampleEntity sampleEntity1 = SampleEntity.builder().id(documentId)
@@ -193,12 +207,12 @@ public class ElasticsearchTemplateTests {
 		LinkedList<SampleEntity> sampleEntities = elasticsearchTemplate.multiGet(query, SampleEntity.class, new MultiGetResultMapper() {
 			@Override
 			public <T> LinkedList<T> mapResults(MultiGetResponse responses, Class<T> clazz) {
-				LinkedList<T> list = new LinkedList<T>();
+				LinkedList<T> list = new LinkedList<>();
 				for (MultiGetItemResponse response : responses.getResponses()) {
 					SampleEntity entity = new SampleEntity();
 					entity.setId(response.getResponse().getId());
-					entity.setMessage((String) response.getResponse().getField("message").getValue());
-					entity.setType((String) response.getResponse().getField("type").getValue());
+					entity.setMessage((String) response.getResponse().getSource().get("message"));
+					entity.setType((String) response.getResponse().getSource().get("type"));
 					list.add((T) entity);
 				}
 				return list;
@@ -231,7 +245,7 @@ public class ElasticsearchTemplateTests {
 	@Test
 	public void shouldDoBulkIndex() {
 		// given
-		List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		List<IndexQuery> indexQueries = new ArrayList<>();
 		// first document
 		String documentId = randomNumeric(5);
 		SampleEntity sampleEntity1 = SampleEntity.builder().id(documentId).message("some message")
@@ -275,7 +289,7 @@ public class ElasticsearchTemplateTests {
 		UpdateQuery updateQuery = new UpdateQueryBuilder().withId(documentId)
 				.withClass(SampleEntity.class).withIndexRequest(indexRequest).build();
 
-		List<UpdateQuery> queries = new ArrayList<UpdateQuery>();
+		List<UpdateQuery> queries = new ArrayList<>();
 		queries.add(updateQuery);
 
 		// when
@@ -370,7 +384,7 @@ public class ElasticsearchTemplateTests {
 	@Test
 	public void shouldSortResultsGivenSortCriteria() {
 		// given
-		List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		List<IndexQuery> indexQueries = new ArrayList<>();
 		// first document
 		String documentId = randomNumeric(5);
 		SampleEntity sampleEntity1 = SampleEntity.builder().id(documentId)
@@ -398,7 +412,7 @@ public class ElasticsearchTemplateTests {
 		elasticsearchTemplate.refresh(SampleEntity.class);
 
 		SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery())
-				.withSort(new FieldSortBuilder("rate").ignoreUnmapped(true).order(SortOrder.ASC)).build();
+				.withSort(new FieldSortBuilder("rate").order(SortOrder.ASC)).build();
 		// when
 		Page<SampleEntity> sampleEntities = elasticsearchTemplate.queryForPage(searchQuery, SampleEntity.class);
 		// then
@@ -409,7 +423,7 @@ public class ElasticsearchTemplateTests {
 	@Test
 	public void shouldSortResultsGivenMultipleSortCriteria() {
 		// given
-		List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		List<IndexQuery> indexQueries = new ArrayList<>();
 		// first document
 		String documentId = randomNumeric(5);
 		SampleEntity sampleEntity1 = SampleEntity.builder().id(documentId)
@@ -437,8 +451,8 @@ public class ElasticsearchTemplateTests {
 		elasticsearchTemplate.refresh(SampleEntity.class);
 
 		SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery())
-				.withSort(new FieldSortBuilder("rate").ignoreUnmapped(true).order(SortOrder.ASC))
-				.withSort(new FieldSortBuilder("message").ignoreUnmapped(true).order(SortOrder.ASC)).build();
+				.withSort(new FieldSortBuilder("rate").order(SortOrder.ASC))
+				.withSort(new FieldSortBuilder("message").order(SortOrder.ASC)).build();
 		// when
 		Page<SampleEntity> sampleEntities = elasticsearchTemplate.queryForPage(searchQuery, SampleEntity.class);
 		// then
@@ -483,18 +497,18 @@ public class ElasticsearchTemplateTests {
 		elasticsearchTemplate.index(indexQuery);
 		elasticsearchTemplate.refresh(SampleEntity.class);
 
-		Map<String, Object> params = new HashMap<String, Object>();
+		Map<String, Object> params = new HashMap<>();
 		params.put("factor", 2);
 		// when
 		SearchQuery searchQuery = new NativeSearchQueryBuilder()
 				.withQuery(matchAllQuery())
 				.withScriptField(new ScriptField("scriptedRate",
-						new Script("doc['rate'].value * factor", ScriptService.ScriptType.INLINE, null, params)))
+						new Script(ScriptType.INLINE, "expression", "doc['rate'] * factor", params)))
 				.build();
 		Page<SampleEntity> sampleEntities = elasticsearchTemplate.queryForPage(searchQuery, SampleEntity.class);
 		// then
 		assertThat(sampleEntities.getTotalElements(), equalTo(1L));
-		assertThat(sampleEntities.getContent().get(0).getScriptedRate(), equalTo(4L));
+		assertThat(sampleEntities.getContent().get(0).getScriptedRate(), equalTo(4.0));
 	}
 
 	@Test
@@ -518,7 +532,6 @@ public class ElasticsearchTemplateTests {
 	}
 
 	@Test
-	@Ignore("By default, the search request will fail if there is no mapping associated with a field. The ignore_unmapped option allows to ignore fields that have no mapping and not sort by them")
 	public void shouldReturnSortedPageableResultsGivenStringQuery() {
 		// given
 		String documentId = randomNumeric(5);
@@ -535,7 +548,7 @@ public class ElasticsearchTemplateTests {
 		elasticsearchTemplate.refresh(SampleEntity.class);
 
 		StringQuery stringQuery = new StringQuery(matchAllQuery().toString(), new PageRequest(0, 10), new Sort(
-				new Sort.Order(Sort.Direction.ASC, "messsage")));
+				new Sort.Order(Sort.Direction.ASC, "message")));
 		// when
 		Page<SampleEntity> sampleEntities = elasticsearchTemplate.queryForPage(stringQuery, SampleEntity.class);
 		// then
@@ -566,6 +579,7 @@ public class ElasticsearchTemplateTests {
 	public void shouldCreateIndexGivenEntityClass() {
 		// when
 		boolean created = elasticsearchTemplate.createIndex(SampleEntity.class);
+		elasticsearchTemplate.putMapping(SampleEntity.class);
 		final Map setting = elasticsearchTemplate.getSetting(SampleEntity.class);
 		// then
 		assertThat(created, is(true));
@@ -632,12 +646,12 @@ public class ElasticsearchTemplateTests {
 		// when
 		Page<String> page = elasticsearchTemplate.queryForPage(searchQuery, String.class, new SearchResultMapper() {
 			@Override
-			public <T> Page<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
-				List<String> values = new ArrayList<String>();
+			public <T> AggregatedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
+				List<String> values = new ArrayList<>();
 				for (SearchHit searchHit : response.getHits()) {
-					values.add((String) searchHit.field("message").value());
+					values.add((String) searchHit.getSource().get("message"));
 				}
-				return new PageImpl<T>((List<T>) values);
+				return new AggregatedPageImpl<>((List<T>) values);
 			}
 		});
 		// then
@@ -725,18 +739,13 @@ public class ElasticsearchTemplateTests {
 		criteriaQuery.addTypes(TYPE_NAME);
 		criteriaQuery.setPageable(new PageRequest(0, 10));
 
-		String scrollId = elasticsearchTemplate.scan(criteriaQuery, 1000, false);
-		List<SampleEntity> sampleEntities = new ArrayList<SampleEntity>();
-		boolean hasRecords = true;
-		while (hasRecords) {
-			Page<SampleEntity> page = elasticsearchTemplate.scroll(scrollId, 5000L, SampleEntity.class);
-			if (page.hasContent()) {
-				sampleEntities.addAll(page.getContent());
-			} else {
-				hasRecords = false;
-			}
+		ScrolledPage<SampleEntity> scroll = (ScrolledPage<SampleEntity>) elasticsearchTemplate.startScroll( 1000, criteriaQuery, SampleEntity.class);
+		List<SampleEntity> sampleEntities = new ArrayList<>();
+		while (scroll.hasContent()) {
+			sampleEntities.addAll(scroll.getContent());
+			scroll = (ScrolledPage<SampleEntity>) elasticsearchTemplate.continueScroll(scroll.getScrollId() , 1000, SampleEntity.class);
 		}
-		elasticsearchTemplate.clearScroll(scrollId);
+		elasticsearchTemplate.clearScroll(scroll.getScrollId());
 		assertThat(sampleEntities.size(), is(equalTo(30)));
 	}
 
@@ -752,26 +761,44 @@ public class ElasticsearchTemplateTests {
 		SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).withIndices(INDEX_NAME)
 				.withTypes(TYPE_NAME).withPageable(new PageRequest(0, 10)).build();
 
-		String scrollId = elasticsearchTemplate.scan(searchQuery, 1000, false);
-		List<SampleEntity> sampleEntities = new ArrayList<SampleEntity>();
-		boolean hasRecords = true;
-		while (hasRecords) {
-			Page<SampleEntity> page = elasticsearchTemplate.scroll(scrollId, 5000L, SampleEntity.class);
-			if (page.hasContent()) {
-				sampleEntities.addAll(page.getContent());
-			} else {
-				hasRecords = false;
-			}
+		ScrolledPage<SampleEntity> scroll = (ScrolledPage<SampleEntity>) elasticsearchTemplate.startScroll(1000, searchQuery, SampleEntity.class);
+		List<SampleEntity> sampleEntities = new ArrayList<>();
+		while (scroll.hasContent()) {
+			sampleEntities.addAll(scroll.getContent());
+			scroll = (ScrolledPage<SampleEntity>) elasticsearchTemplate.continueScroll(scroll.getScrollId() , 1000, SampleEntity.class);
 		}
-		elasticsearchTemplate.clearScroll(scrollId);
+		elasticsearchTemplate.clearScroll(scroll.getScrollId());
 		assertThat(sampleEntities.size(), is(equalTo(30)));
 	}
 
+
+	final SearchResultMapper searchResultMapper = new SearchResultMapper() {
+		@Override
+		public <T> AggregatedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
+			List<SampleEntity> result = new ArrayList<SampleEntity>();
+			for (SearchHit searchHit : response.getHits()) {
+				if (response.getHits().getHits().length <= 0) {
+					return new AggregatedPageImpl<T>(Collections.EMPTY_LIST, response.getScrollId());
+				}
+				String message = (String) searchHit.getSource().get("message");
+				SampleEntity sampleEntity = new SampleEntity();
+				sampleEntity.setId(searchHit.getId());
+				sampleEntity.setMessage(message);
+				result.add(sampleEntity);
+			}
+
+			if (result.size() > 0) {
+				return new AggregatedPageImpl<T>((List<T>) result, response.getScrollId());
+			}
+			return new AggregatedPageImpl<T>(Collections.EMPTY_LIST, response.getScrollId());
+		}
+	};
+
 	/*
 	DATAES-167
 	*/
 	@Test
-	public void shouldReturnResultsWithScanAndScrollForSpecifiedFieldsForCriteriaCriteria() {
+	public void shouldReturnResultsWithScanAndScrollForSpecifiedFieldsForCriteriaQuery() {
 		//given
 		List<IndexQuery> entities = createSampleEntitiesWithMessage("Test message", 30);
 		// when
@@ -785,35 +812,15 @@ public class ElasticsearchTemplateTests {
 		criteriaQuery.addFields("message");
 		criteriaQuery.setPageable(new PageRequest(0, 10));
 
-		String scrollId = elasticsearchTemplate.scan(criteriaQuery, 5000, false);
-		List<SampleEntity> sampleEntities = new ArrayList<SampleEntity>();
-		boolean hasRecords = true;
-		while (hasRecords) {
-			Page<SampleEntity> page = elasticsearchTemplate.scroll(scrollId, 5000L, new SearchResultMapper() {
-				@Override
-				public <T> Page<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
-					List<SampleEntity> result = new ArrayList<SampleEntity>();
-					for (SearchHit searchHit : response.getHits()) {
-						String message = searchHit.getFields().get("message").getValue();
-						SampleEntity sampleEntity = new SampleEntity();
-						sampleEntity.setId(searchHit.getId());
-						sampleEntity.setMessage(message);
-						result.add(sampleEntity);
-					}
-
-					if (result.size() > 0) {
-						return new PageImpl<T>((List<T>) result);
-					}
-					return null;
-				}
-			});
-			if (page != null) {
-				sampleEntities.addAll(page.getContent());
-			} else {
-				hasRecords = false;
+		Page<SampleEntity> scroll = elasticsearchTemplate.startScroll(1000, criteriaQuery, SampleEntity.class, searchResultMapper);
+		String scrollId = ((ScrolledPage<?>)scroll).getScrollId();
+		List<SampleEntity> sampleEntities = new ArrayList<>();
+        while (scroll.hasContent()) {
+            sampleEntities.addAll(scroll.getContent());
+            scrollId = ((ScrolledPage<?>)scroll).getScrollId();
+            scroll =  elasticsearchTemplate.continueScroll(scrollId , 1000, SampleEntity.class, searchResultMapper);
 			}
-		}
-		elasticsearchTemplate.clearScroll(scrollId);
+		elasticsearchTemplate. clearScroll(scrollId);
 		assertThat(sampleEntities.size(), is(equalTo(30)));
 	}
 
@@ -837,33 +844,13 @@ public class ElasticsearchTemplateTests {
 				.withPageable(new PageRequest(0, 10))
 				.build();
 
-		String scrollId = elasticsearchTemplate.scan(searchQuery, 10000, false);
-		List<SampleEntity> sampleEntities = new ArrayList<SampleEntity>();
-		boolean hasRecords = true;
-		while (hasRecords) {
-			Page<SampleEntity> page = elasticsearchTemplate.scroll(scrollId, 10000L, new SearchResultMapper() {
-				@Override
-				public <T> Page<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
-					List<SampleEntity> result = new ArrayList<SampleEntity>();
-					for (SearchHit searchHit : response.getHits()) {
-						String message = searchHit.getFields().get("message").getValue();
-						SampleEntity sampleEntity = new SampleEntity();
-						sampleEntity.setId(searchHit.getId());
-						sampleEntity.setMessage(message);
-						result.add(sampleEntity);
-					}
-
-					if (result.size() > 0) {
-						return new PageImpl<T>((List<T>) result);
-					}
-					return null;
-				}
-			});
-			if (page != null) {
-				sampleEntities.addAll(page.getContent());
-			} else {
-				hasRecords = false;
-			}
+		Page<SampleEntity> scroll = elasticsearchTemplate.startScroll(1000, searchQuery, SampleEntity.class, searchResultMapper);
+		String scrollId = ((ScrolledPage) scroll).getScrollId();
+		List<SampleEntity> sampleEntities = new ArrayList<>();
+        while (scroll.hasContent()) {
+            sampleEntities.addAll(scroll.getContent());
+            scrollId = ((ScrolledPage) scroll).getScrollId();
+            scroll = elasticsearchTemplate.continueScroll(scrollId, 1000, SampleEntity.class, searchResultMapper);
 		}
 		elasticsearchTemplate.clearScroll(scrollId);
 		assertThat(sampleEntities.size(), is(equalTo(30)));
@@ -886,34 +873,13 @@ public class ElasticsearchTemplateTests {
 		criteriaQuery.addTypes(TYPE_NAME);
 		criteriaQuery.setPageable(new PageRequest(0, 10));
 
-		String scrollId = elasticsearchTemplate.scan(criteriaQuery, 5000, false);
-		List<SampleEntity> sampleEntities = new ArrayList<SampleEntity>();
-		boolean hasRecords = true;
-		while (hasRecords) {
-			Page<SampleEntity> page = elasticsearchTemplate.scroll(scrollId, 5000L, new SearchResultMapper() {
-				@Override
-				public <T> Page<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
-					List<SampleEntity> chunk = new ArrayList<SampleEntity>();
-					for (SearchHit searchHit : response.getHits()) {
-						if (response.getHits().getHits().length <= 0) {
-							return null;
-						}
-						SampleEntity user = new SampleEntity();
-						user.setId(searchHit.getId());
-						user.setMessage((String) searchHit.getSource().get("message"));
-						chunk.add(user);
-					}
-					if (chunk.size() > 0) {
-						return new PageImpl<T>((List<T>) chunk);
-					}
-					return null;
-				}
-			});
-			if (page != null) {
-				sampleEntities.addAll(page.getContent());
-			} else {
-				hasRecords = false;
-			}
+		Page<SampleEntity> scroll = elasticsearchTemplate.startScroll(1000, criteriaQuery, SampleEntity.class, searchResultMapper);
+		String scrollId = ((ScrolledPage) scroll).getScrollId();
+		List<SampleEntity> sampleEntities = new ArrayList<>();
+        while (scroll.hasContent()) {
+            sampleEntities.addAll(scroll.getContent());
+            scrollId = ((ScrolledPage) scroll).getScrollId();
+            scroll = elasticsearchTemplate.continueScroll(scrollId, 1000, SampleEntity.class, searchResultMapper);
 		}
 		elasticsearchTemplate.clearScroll(scrollId);
 		assertThat(sampleEntities.size(), is(equalTo(30)));
@@ -931,34 +897,13 @@ public class ElasticsearchTemplateTests {
 		SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).withIndices(INDEX_NAME)
 				.withTypes(TYPE_NAME).withPageable(new PageRequest(0, 10)).build();
 
-		String scrollId = elasticsearchTemplate.scan(searchQuery, 1000, false);
-		List<SampleEntity> sampleEntities = new ArrayList<SampleEntity>();
-		boolean hasRecords = true;
-		while (hasRecords) {
-			Page<SampleEntity> page = elasticsearchTemplate.scroll(scrollId, 5000L, new SearchResultMapper() {
-				@Override
-				public <T> Page<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
-					List<SampleEntity> chunk = new ArrayList<SampleEntity>();
-					for (SearchHit searchHit : response.getHits()) {
-						if (response.getHits().getHits().length <= 0) {
-							return null;
-						}
-						SampleEntity user = new SampleEntity();
-						user.setId(searchHit.getId());
-						user.setMessage((String) searchHit.getSource().get("message"));
-						chunk.add(user);
-					}
-					if (chunk.size() > 0) {
-						return new PageImpl<T>((List<T>) chunk);
-					}
-					return null;
-				}
-			});
-			if (page != null) {
-				sampleEntities.addAll(page.getContent());
-			} else {
-				hasRecords = false;
-			}
+		Page<SampleEntity> scroll = elasticsearchTemplate.startScroll(1000, searchQuery, SampleEntity.class,searchResultMapper);
+		String scrollId = ((ScrolledPage) scroll).getScrollId();
+		List<SampleEntity> sampleEntities = new ArrayList<>();
+        while (scroll.hasContent()) {
+            sampleEntities.addAll(scroll.getContent());
+            scrollId = ((ScrolledPage) scroll).getScrollId();
+            scroll = elasticsearchTemplate.continueScroll(scrollId, 1000, SampleEntity.class, searchResultMapper);
 		}
 		elasticsearchTemplate.clearScroll(scrollId);
 		assertThat(sampleEntities.size(), is(equalTo(30)));
@@ -979,16 +924,13 @@ public class ElasticsearchTemplateTests {
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria());
 		criteriaQuery.setPageable(new PageRequest(0, 10));
 
-		String scrollId = elasticsearchTemplate.scan(criteriaQuery, 1000, false, SampleEntity.class);
-		List<SampleEntity> sampleEntities = new ArrayList<SampleEntity>();
-		boolean hasRecords = true;
-		while (hasRecords) {
-			Page<SampleEntity> page = elasticsearchTemplate.scroll(scrollId, 5000L, SampleEntity.class);
-			if (page.hasContent()) {
-				sampleEntities.addAll(page.getContent());
-			} else {
-				hasRecords = false;
-			}
+		Page<SampleEntity> scroll = elasticsearchTemplate.startScroll(1000, criteriaQuery, SampleEntity.class);
+		String scrollId = ((ScrolledPage) scroll).getScrollId();
+		List<SampleEntity> sampleEntities = new ArrayList<>();
+		while (scroll.hasContent()) {
+			sampleEntities.addAll(scroll.getContent());
+			scrollId = ((ScrolledPage) scroll).getScrollId();
+			scroll = elasticsearchTemplate.continueScroll(scrollId, 1000, SampleEntity.class);
 		}
 		elasticsearchTemplate.clearScroll(scrollId);
 		assertThat(sampleEntities.size(), is(equalTo(30)));
@@ -1009,16 +951,13 @@ public class ElasticsearchTemplateTests {
 		SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery())
 				.withPageable(new PageRequest(0, 10)).build();
 
-		String scrollId = elasticsearchTemplate.scan(searchQuery, 1000, false, SampleEntity.class);
-		List<SampleEntity> sampleEntities = new ArrayList<SampleEntity>();
-		boolean hasRecords = true;
-		while (hasRecords) {
-			Page<SampleEntity> page = elasticsearchTemplate.scroll(scrollId, 5000L, SampleEntity.class);
-			if (page.hasContent()) {
-				sampleEntities.addAll(page.getContent());
-			} else {
-				hasRecords = false;
-			}
+		Page<SampleEntity> scroll = elasticsearchTemplate.startScroll(1000, searchQuery, SampleEntity.class);
+		String scrollId = ((ScrolledPage) scroll).getScrollId();
+		List<SampleEntity> sampleEntities = new ArrayList<>();
+		while (scroll.hasContent()) {
+			sampleEntities.addAll(scroll.getContent());
+			scrollId = ((ScrolledPage) scroll).getScrollId();
+			scroll = elasticsearchTemplate.continueScroll(scrollId, 1000, SampleEntity.class);
 		}
 		elasticsearchTemplate.clearScroll(scrollId);
 		assertThat(sampleEntities.size(), is(equalTo(30)));
@@ -1042,7 +981,7 @@ public class ElasticsearchTemplateTests {
 		criteriaQuery.setPageable(new PageRequest(0, 10));
 
 		CloseableIterator<SampleEntity> stream = elasticsearchTemplate.stream(criteriaQuery, SampleEntity.class);
-		List<SampleEntity> sampleEntities = new ArrayList<SampleEntity>();
+		List<SampleEntity> sampleEntities = new ArrayList<>();
 		while (stream.hasNext()) {
 			sampleEntities.add(stream.next());
 		}
@@ -1050,7 +989,7 @@ public class ElasticsearchTemplateTests {
 	}
 
 	private static List<IndexQuery> createSampleEntitiesWithMessage(String message, int numberOfEntities) {
-		List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		List<IndexQuery> indexQueries = new ArrayList<>();
 		for (int i = 0; i < numberOfEntities; i++) {
 			String documentId = UUID.randomUUID().toString();
 			SampleEntity sampleEntity = new SampleEntity();
@@ -1069,7 +1008,7 @@ public class ElasticsearchTemplateTests {
 	@Test
 	public void shouldReturnListForGivenCriteria() {
 		// given
-		List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		List<IndexQuery> indexQueries = new ArrayList<>();
 		// first document
 		String documentId = randomNumeric(5);
 		SampleEntity sampleEntity1 = SampleEntity.builder().id(documentId)
@@ -1147,6 +1086,7 @@ public class ElasticsearchTemplateTests {
 	public void shouldPutMappingForGivenEntity() throws Exception {
 		// given
 		Class entity = SampleMappingEntity.class;
+		elasticsearchTemplate.deleteIndex(entity);
 		elasticsearchTemplate.createIndex(entity);
 		// when
 		assertThat(elasticsearchTemplate.putMapping(entity), is(true));
@@ -1236,15 +1176,16 @@ public class ElasticsearchTemplateTests {
 		elasticsearchTemplate.index(indexQuery);
 		elasticsearchTemplate.refresh(SampleEntity.class);
 
+		final List<HighlightBuilder.Field> message = new HighlightBuilder().field("message").fields();
 		SearchQuery searchQuery = new NativeSearchQueryBuilder()
 				.withQuery(termQuery("message", "test"))
-				.withHighlightFields(new HighlightBuilder.Field("message"))
+				.withHighlightFields(message.toArray(new HighlightBuilder.Field[message.size()]))
 				.build();
 
 		Page<SampleEntity> sampleEntities = elasticsearchTemplate.queryForPage(searchQuery, SampleEntity.class, new SearchResultMapper() {
 			@Override
-			public <T> Page<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
-				List<SampleEntity> chunk = new ArrayList<SampleEntity>();
+			public <T> AggregatedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
+				List<SampleEntity> chunk = new ArrayList<>();
 				for (SearchHit searchHit : response.getHits()) {
 					if (response.getHits().getHits().length <= 0) {
 						return null;
@@ -1256,7 +1197,7 @@ public class ElasticsearchTemplateTests {
 					chunk.add(user);
 				}
 				if (chunk.size() > 0) {
-					return new PageImpl<T>((List<T>) chunk);
+					return new AggregatedPageImpl<>((List<T>) chunk);
 				}
 				return null;
 			}
@@ -1310,15 +1251,15 @@ public class ElasticsearchTemplateTests {
 		// then
 		Page<SampleEntity> page = elasticsearchTemplate.queryForPage(searchQuery, SampleEntity.class, new SearchResultMapper() {
 			@Override
-			public <T> Page<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
-				List<SampleEntity> values = new ArrayList<SampleEntity>();
+			public <T> AggregatedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
+				List<SampleEntity> values = new ArrayList<>();
 				for (SearchHit searchHit : response.getHits()) {
 					SampleEntity sampleEntity = new SampleEntity();
 					sampleEntity.setId(searchHit.getId());
 					sampleEntity.setMessage((String) searchHit.getSource().get("message"));
 					values.add(sampleEntity);
 				}
-				return new PageImpl<T>((List<T>) values);
+				return new AggregatedPageImpl<>((List<T>) values);
 			}
 		});
 		assertThat(page, is(notNullValue()));
@@ -1360,7 +1301,7 @@ public class ElasticsearchTemplateTests {
 	@Test
 	public void shouldReturnDocumentAboveMinimalScoreGivenQuery() {
 		// given
-		List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		List<IndexQuery> indexQueries = new ArrayList<>();
 
 		indexQueries.add(buildIndex(SampleEntity.builder().id("1").message("ab").build()));
 		indexQueries.add(buildIndex(SampleEntity.builder().id("2").message("bc").build()));
@@ -1371,10 +1312,13 @@ public class ElasticsearchTemplateTests {
 
 		// when
 		SearchQuery searchQuery = new NativeSearchQueryBuilder()
-				.withQuery(boolQuery().must(wildcardQuery("message", "*a*")).should(wildcardQuery("message", "*b*")))
+				.withQuery(boolQuery()
+						.must(wildcardQuery("message", "*a*"))
+						.should(wildcardQuery("message", "*b*"))
+				)
 				.withIndices(INDEX_NAME)
 				.withTypes(TYPE_NAME)
-				.withMinScore(0.5F)
+				.withMinScore(2.0F)
 				.build();
 
 		Page<SampleEntity> page = elasticsearchTemplate.queryForPage(searchQuery, SampleEntity.class);
@@ -1408,7 +1352,7 @@ public class ElasticsearchTemplateTests {
 	@Test
 	public void shouldDoBulkIndexWithoutId() {
 		// given
-		List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		List<IndexQuery> indexQueries = new ArrayList<>();
 		// first document
 		SampleEntity sampleEntity1 = new SampleEntity();
 		sampleEntity1.setMessage("some message");
@@ -1441,14 +1385,14 @@ public class ElasticsearchTemplateTests {
 	@Test
 	public void shouldIndexMapWithIndexNameAndTypeAtRuntime() {
 		//given
-		Map<String, Object> person1 = new HashMap<String, Object>();
+		Map<String, Object> person1 = new HashMap<>();
 		person1.put("userId", "1");
 		person1.put("email", "smhdiu@gmail.com");
 		person1.put("title", "Mr");
 		person1.put("firstName", "Mohsin");
 		person1.put("lastName", "Husen");
 
-		Map<String, Object> person2 = new HashMap<String, Object>();
+		Map<String, Object> person2 = new HashMap<>();
 		person2.put("userId", "2");
 		person2.put("email", "akonczak@gmail.com");
 		person2.put("title", "Mr");
@@ -1467,7 +1411,7 @@ public class ElasticsearchTemplateTests {
 		indexQuery2.setIndexName(INDEX_NAME);
 		indexQuery2.setType(TYPE_NAME);
 
-		List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		List<IndexQuery> indexQueries = new ArrayList<>();
 		indexQueries.add(indexQuery1);
 		indexQueries.add(indexQuery2);
 
@@ -1480,13 +1424,13 @@ public class ElasticsearchTemplateTests {
 				.withTypes(TYPE_NAME).withQuery(matchAllQuery()).build();
 		Page<Map> sampleEntities = elasticsearchTemplate.queryForPage(searchQuery, Map.class, new SearchResultMapper() {
 			@Override
-			public <T> Page<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
-				List<Map> chunk = new ArrayList<Map>();
+			public <T> AggregatedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
+				List<Map> chunk = new ArrayList<>();
 				for (SearchHit searchHit : response.getHits()) {
 					if (response.getHits().getHits().length <= 0) {
 						return null;
 					}
-					Map<String, Object> person = new HashMap<String, Object>();
+					Map<String, Object> person = new HashMap<>();
 					person.put("userId", searchHit.getSource().get("userId"));
 					person.put("email", searchHit.getSource().get("email"));
 					person.put("title", searchHit.getSource().get("title"));
@@ -1495,7 +1439,7 @@ public class ElasticsearchTemplateTests {
 					chunk.add(person);
 				}
 				if (chunk.size() > 0) {
-					return new PageImpl<T>((List<T>) chunk);
+					return new AggregatedPageImpl<>((List<T>) chunk);
 				}
 				return null;
 			}
@@ -1543,7 +1487,7 @@ public class ElasticsearchTemplateTests {
 		elasticsearchTemplate.index(indexQuery);
 		elasticsearchTemplate.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria());
-		criteriaQuery.addIndices("test-index");
+		criteriaQuery.addIndices(INDEX_NAME);
 		// when
 		long count = elasticsearchTemplate.count(criteriaQuery);
 		// then
@@ -1565,7 +1509,7 @@ public class ElasticsearchTemplateTests {
 		elasticsearchTemplate.refresh(SampleEntity.class);
 		SearchQuery searchQuery = new NativeSearchQueryBuilder()
 				.withQuery(matchAllQuery())
-				.withIndices("test-index")
+				.withIndices(INDEX_NAME)
 				.build();
 		// when
 		long count = elasticsearchTemplate.count(searchQuery);
@@ -1587,7 +1531,7 @@ public class ElasticsearchTemplateTests {
 		elasticsearchTemplate.index(indexQuery);
 		elasticsearchTemplate.refresh(SampleEntity.class);
 		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria());
-		criteriaQuery.addIndices("test-index");
+		criteriaQuery.addIndices(INDEX_NAME);
 		criteriaQuery.addTypes("test-type");
 		// when
 		long count = elasticsearchTemplate.count(criteriaQuery);
@@ -1610,7 +1554,7 @@ public class ElasticsearchTemplateTests {
 		elasticsearchTemplate.refresh(SampleEntity.class);
 		SearchQuery searchQuery = new NativeSearchQueryBuilder()
 				.withQuery(matchAllQuery())
-				.withIndices("test-index")
+				.withIndices(INDEX_NAME)
 				.withTypes("test-type")
 				.build();
 		// when
@@ -1924,11 +1868,12 @@ public class ElasticsearchTemplateTests {
 
 		elasticsearchTemplate.deleteIndex(SampleEntity.class);
 		elasticsearchTemplate.createIndex(SampleEntity.class, settings);
+		elasticsearchTemplate.putMapping(SampleEntity.class);
 		elasticsearchTemplate.refresh(SampleEntity.class);
 
 		// then
 		Map map = elasticsearchTemplate.getSetting(SampleEntity.class);
-		assertThat(elasticsearchTemplate.indexExists("test-index"), is(true));
+		assertThat(elasticsearchTemplate.indexExists(INDEX_NAME), is(true));
 		assertThat(map.containsKey("index.number_of_replicas"), is(true));
 		assertThat(map.containsKey("index.number_of_shards"), is(true));
 		assertThat((String) map.get("index.number_of_replicas"), is("0"));
@@ -1994,15 +1939,15 @@ public class ElasticsearchTemplateTests {
 		SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(matchAllQuery()).withTypes("hetro").withIndices(INDEX_1_NAME, INDEX_2_NAME).build();
 		Page<ResultAggregator> page = elasticsearchTemplate.queryForPage(searchQuery, ResultAggregator.class, new SearchResultMapper() {
 			@Override
-			public <T> Page<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
-				List<ResultAggregator> values = new ArrayList<ResultAggregator>();
+			public <T> AggregatedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
+				List<ResultAggregator> values = new ArrayList<>();
 				for (SearchHit searchHit : response.getHits()) {
 					String id = String.valueOf(searchHit.getSource().get("id"));
 					String firstName = StringUtils.isNotEmpty((String) searchHit.getSource().get("firstName")) ? (String) searchHit.getSource().get("firstName") : "";
 					String lastName = StringUtils.isNotEmpty((String) searchHit.getSource().get("lastName")) ? (String) searchHit.getSource().get("lastName") : "";
 					values.add(new ResultAggregator(id, firstName, lastName));
 				}
-				return new PageImpl<T>((List<T>) values);
+				return new AggregatedPageImpl<>((List<T>) values);
 			}
 		});
 
@@ -2046,7 +1991,7 @@ public class ElasticsearchTemplateTests {
 	}
 
 	private List<IndexQuery> getIndexQueries(List<SampleEntity> sampleEntities) {
-		List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		List<IndexQuery> indexQueries = new ArrayList<>();
 		for (SampleEntity sampleEntity : sampleEntities) {
 			indexQueries.add(new IndexQueryBuilder().withId(sampleEntity.getId()).withObject(sampleEntity).build());
 		}

src/test/java/org/springframework/data/elasticsearch/core/MappingBuilderTests.java

@@ -53,14 +53,16 @@ public class MappingBuilderTests {
 
 	@Test
 	public void shouldNotFailOnCircularReference() {
+		elasticsearchTemplate.deleteIndex(SimpleRecursiveEntity.class);
 		elasticsearchTemplate.createIndex(SimpleRecursiveEntity.class);
 		elasticsearchTemplate.putMapping(SimpleRecursiveEntity.class);
+		elasticsearchTemplate.refresh(SimpleRecursiveEntity.class);
 	}
 
 	@Test
 	public void testInfiniteLoopAvoidance() throws IOException {
 		final String expected = "{\"mapping\":{\"properties\":{\"message\":{\"store\":true,\"" +
-				"type\":\"string\",\"index\":\"not_analyzed\"," +
+				"type\":\"text\",\"index\":false," +
 				"\"analyzer\":\"standard\"}}}}";
 
 		XContentBuilder xContentBuilder = MappingBuilder.buildMapping(SampleTransientEntity.class, "mapping", "id", null);
@@ -115,9 +117,9 @@ public class MappingBuilderTests {
 	@Test
 	public void shouldBuildMappingWithSuperclass() throws IOException {
 		final String expected = "{\"mapping\":{\"properties\":{\"message\":{\"store\":true,\"" +
-				"type\":\"string\",\"index\":\"not_analyzed\",\"analyzer\":\"standard\"}" +
+				"type\":\"text\",\"index\":false,\"analyzer\":\"standard\"}" +
 				",\"createdDate\":{\"store\":false," +
-				"\"type\":\"date\",\"index\":\"not_analyzed\"}}}}";
+				"\"type\":\"date\",\"index\":false}}}}";
 
 		XContentBuilder xContentBuilder = MappingBuilder.buildMapping(SampleInheritedEntity.class, "mapping", "id", null);
 		assertThat(xContentBuilder.string(), is(expected));
@@ -164,4 +166,31 @@ public class MappingBuilderTests {
 		assertThat(result, containsString("\"pointC\":{\"type\":\"geo_point\""));
 		assertThat(result, containsString("\"pointD\":{\"type\":\"geo_point\""));
 	}
+
+	/**
+	 * DATAES-260 - StacOverflow when two reverse relationship.
+	 */
+	@Test
+	public void shouldHandleReverseRelationship() {
+		//given
+		elasticsearchTemplate.createIndex(User.class);
+		elasticsearchTemplate.putMapping(User.class);
+		elasticsearchTemplate.createIndex(Group.class);
+		elasticsearchTemplate.putMapping(Group.class);
+		//when
+
+		//then
+
+	}
+
+	@Test
+	public void shouldMapBooks() {
+		//given
+		elasticsearchTemplate.createIndex(Book.class);
+		elasticsearchTemplate.putMapping(Book.class);
+		//when
+
+		//then
+
+	}
 }

src/test/java/org/springframework/data/elasticsearch/core/SimpleElasticsearchDateMappingTests.java

@@ -30,7 +30,7 @@ import org.springframework.data.elasticsearch.entities.SampleDateMappingEntity;
 public class SimpleElasticsearchDateMappingTests {
 
 	private static final String EXPECTED_MAPPING = "{\"mapping\":{\"properties\":{\"message\":{\"store\":true," +
-			"\"type\":\"string\",\"index\":\"not_analyzed\",\"analyzer\":\"standard\"},\"customFormatDate\":{\"store\":false,\"type\":\"date\",\"format\":\"dd.MM.yyyy hh:mm\"}," +
+			"\"type\":\"text\",\"index\":false,\"analyzer\":\"standard\"},\"customFormatDate\":{\"store\":false,\"type\":\"date\",\"format\":\"dd.MM.yyyy hh:mm\"}," +
 			"\"defaultFormatDate\":{\"store\":false,\"type\":\"date\"},\"basicFormatDate\":{\"store\":false,\"" +
 			"type\":\"date\",\"format\":\"basic_date\"}}}}";
 

src/test/java/org/springframework/data/elasticsearch/core/aggregation/ElasticsearchTemplateAggregationTests.java

@@ -15,7 +15,14 @@
  */
 package org.springframework.data.elasticsearch.core.aggregation;
 
+import static org.elasticsearch.action.search.SearchType.*;
+import static org.elasticsearch.index.query.QueryBuilders.*;
+import static org.elasticsearch.search.aggregations.AggregationBuilders.*;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
 import org.elasticsearch.action.search.SearchResponse;
+import org.elasticsearch.action.search.SearchType;
 import org.elasticsearch.search.aggregations.Aggregations;
 import org.junit.Before;
 import org.junit.Test;
@@ -30,7 +37,6 @@ import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilde
 import org.springframework.data.elasticsearch.core.query.SearchQuery;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-import static org.elasticsearch.action.search.SearchType.COUNT;
 import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
 import static org.elasticsearch.search.aggregations.AggregationBuilders.terms;
 import static org.hamcrest.Matchers.is;
@@ -81,8 +87,8 @@ public class ElasticsearchTemplateAggregationTests {
 		// given
 		SearchQuery searchQuery = new NativeSearchQueryBuilder()
 				.withQuery(matchAllQuery())
-				.withSearchType(COUNT)
-				.withIndices("articles").withTypes("article")
+				.withSearchType(SearchType.DEFAULT)
+				.withIndices("test-index-articles").withTypes("article")
 				.addAggregation(terms("subjects").field("subject"))
 				.build();
 		// when

src/test/java/org/springframework/data/elasticsearch/core/completion/AnnotatedCompletionEntity.java

@@ -7,14 +7,14 @@ import org.springframework.data.elasticsearch.annotations.Document;
 /**
  * @author Mewes Kochheim
  */
-@Document(indexName = "test-completion-index", type = "annotated-completion-type", shards = 1, replicas = 0, refreshInterval = "-1")
+@Document(indexName = "test-index-annotated-completion", type = "annotated-completion-type", shards = 1, replicas = 0, refreshInterval = "-1")
 public class AnnotatedCompletionEntity {
 
 	@Id
 	private String id;
 	private String name;
 
-	@CompletionField(payloads = true, maxInputLength = 100)
+	@CompletionField(maxInputLength = 100)
 	private Completion suggest;
 
 	private AnnotatedCompletionEntity() {

src/test/java/org/springframework/data/elasticsearch/core/completion/AnnotatedCompletionEntityBuilder.java

@@ -36,23 +36,12 @@ public class AnnotatedCompletionEntityBuilder {
 	}
 
 	public AnnotatedCompletionEntityBuilder suggest(String[] input) {
-		return suggest(input, null, null, null);
+		return suggest(input, null);
 	}
 
-	public AnnotatedCompletionEntityBuilder suggest(String[] input, String output) {
-		return suggest(input, output, null, null);
-	}
-
-	public AnnotatedCompletionEntityBuilder suggest(String[] input, String output, Object payload) {
-		return suggest(input, output, payload, null);
-	}
-
-	public AnnotatedCompletionEntityBuilder suggest(String[] input, String output, Object payload, Integer weight) {
+	public AnnotatedCompletionEntityBuilder suggest(String[] input, Integer weight) {
 		Completion suggest = new Completion(input);
-		suggest.setOutput(output);
-		suggest.setPayload(payload);
 		suggest.setWeight(weight);
-
 		result.setSuggest(suggest);
 		return this;
 	}

src/test/java/org/springframework/data/elasticsearch/core/completion/CompletionAnnotatedEntity.java

@@ -9,14 +9,14 @@ import org.springframework.data.elasticsearch.annotations.Document;
  * @author Mohsin Husen
  * @author Mewes Kochheim
  */
-@Document(indexName = "test-completion-index", type = "completion-annotation-type", shards = 1, replicas = 0, refreshInterval = "-1")
+@Document(indexName = "test-index-completion-annotated", type = "completion-annotation-type", shards = 1, replicas = 0, refreshInterval = "-1")
 public class CompletionAnnotatedEntity {
 
 	@Id
 	private String id;
 	private String name;
 
-	@CompletionField(payloads = true)
+	@CompletionField
 	private Completion suggest;
 
 	private CompletionAnnotatedEntity() {