DATAES-463 - Release version 2.1.14 (Ingalls SR14).

Polished use of TypeInformation in MappingBuilder to remove reference to GenericCollectionTypeResolver which was removed in Spring Framework 5.

.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

@@ -1,21 +1,21 @@
-atlassian-ide-plugin.xml
-
-## Ignore svn files
-.svn
-
-## 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
-.classpath
-
-## Ignore project files created by IntelliJ IDEA
-*.iml
-*.ipr
-*.iws
-.idea
+atlassian-ide-plugin.xml
+
+## Ignore svn files
+.svn
+
+## 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
+.classpath
+
+## Ignore project files created by IntelliJ IDEA
+*.iml
+*.ipr
+*.iws
+.idea

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>2.0.4.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>2.1.0.BUILD-SNAPSHOT</version>
 </dependency>
 
 <repository>
@@ -52,15 +52,10 @@ the appropriate dependency version.
 </repository>
 ```
 
-### Note:
-
-1) Spring data elaticsearch until 1.0.0.RELEASE version is on elasticsearch 1.1.x library, which uses java 1.6 or later version.
-
-2) From spring data elasticsearch 1.1.0.RELEASE the version of elasticsearch is 1.3.x  which is supporting java 1.7 or later.
-
 |   spring data elasticsearch         | elasticsearch |
 |:-----------------------------------:|:-------------:|
-|           2.0.0.RC1                 |      2.2.0    |
+|           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    |
@@ -250,7 +245,7 @@ Here are some ways for you to get involved in the community:
 * 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,12 +4,12 @@
 
     <groupId>org.springframework.data</groupId>
     <artifactId>spring-data-elasticsearch</artifactId>
-    <version>2.0.0.RELEASE</version>
+    <version>2.1.14.RELEASE</version>
 
     <parent>
         <groupId>org.springframework.data.build</groupId>
         <artifactId>spring-data-parent</artifactId>
-        <version>1.8.0.RELEASE</version>
+        <version>1.9.14.RELEASE</version>
         <relativePath>../spring-data-build/parent/pom.xml</relativePath>
     </parent>
 
@@ -23,8 +23,8 @@
 
         <commonscollections>3.2.1</commonscollections>
         <commonslang>2.6</commonslang>
-        <elasticsearch>2.2.0</elasticsearch>
-        <springdata.commons>1.12.0.RELEASE</springdata.commons>
+        <elasticsearch>2.4.0</elasticsearch>
+        <springdata.commons>1.13.14.RELEASE</springdata.commons>
 
     </properties>
 
@@ -79,12 +79,10 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>${jackson}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson}</version>
         </dependency>
 
         <!-- CDI -->
@@ -100,7 +98,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${spring}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -129,7 +126,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.16.4</version>
+            <version>${lombok}</version>
             <scope>test</scope>
         </dependency>
 

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

@@ -1,51 +1,51 @@
-/*
- * 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 java.util.Map;
-
-/**
- * ElasticsearchException
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public class ElasticsearchException extends RuntimeException {
-
-	private Map<String, String> failedDocuments;
-
-	public ElasticsearchException(String message) {
-		super(message);
-	}
-
-	public ElasticsearchException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-	public ElasticsearchException(String message, Throwable cause, Map<String, String> failedDocuments) {
-		super(message, cause);
-		this.failedDocuments = failedDocuments;
-	}
-
-	public ElasticsearchException(String message, Map<String, String> failedDocuments) {
-		super(message);
-		this.failedDocuments = failedDocuments;
-	}
-
-	public Map<String, String> getFailedDocuments() {
-		return failedDocuments;
-	}
-}
+/*
+ * 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 java.util.Map;
+
+/**
+ * ElasticsearchException
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class ElasticsearchException extends RuntimeException {
+
+	private Map<String, String> failedDocuments;
+
+	public ElasticsearchException(String message) {
+		super(message);
+	}
+
+	public ElasticsearchException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public ElasticsearchException(String message, Throwable cause, Map<String, String> failedDocuments) {
+		super(message, cause);
+		this.failedDocuments = failedDocuments;
+	}
+
+	public ElasticsearchException(String message, Map<String, String> failedDocuments) {
+		super(message);
+		this.failedDocuments = failedDocuments;
+	}
+
+	public Map<String, String> getFailedDocuments() {
+		return failedDocuments;
+	}
+}

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

@@ -1,51 +1,51 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.*;
-
-import org.springframework.data.annotation.Persistent;
-
-/**
- * Document
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Mason Chan
- */
-
-@Persistent
-@Inherited
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE})
-public @interface Document {
-
-	String indexName();
-
-	String type() default "";
-
-	boolean useServerConfiguration() default false;
-
-	short shards() default 5;
-
-	short replicas() default 1;
-
-	String refreshInterval() default "1s";
-
-	String indexStoreType() default "fs";
-
-	boolean createIndex() default true;
-}
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.annotations;
+
+import java.lang.annotation.*;
+
+import org.springframework.data.annotation.Persistent;
+
+/**
+ * Document
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Mason Chan
+ */
+
+@Persistent
+@Inherited
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.TYPE})
+public @interface Document {
+
+	String indexName();
+
+	String type() default "";
+
+	boolean useServerConfiguration() default false;
+
+	short shards() default 5;
+
+	short replicas() default 1;
+
+	String refreshInterval() default "1s";
+
+	String indexStoreType() default "fs";
+
+	boolean createIndex() default true;
+}

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

@@ -1,56 +1,56 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Artur Konczak
- * @author Jonathan Yan
- * @author Jakub Vavrik
- * @author Kevin Leturc
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-@Documented
-@Inherited
-public @interface Field {
-
-	FieldType type() default FieldType.Auto;
-
-	FieldIndex index() default FieldIndex.analyzed;
-
-	DateFormat format() default DateFormat.none;
-
-	String pattern() default "";
-
-	boolean store() default false;
-
-	String searchAnalyzer() default "";
-
-	String analyzer() default "";
-
-	String[] ignoreFields() default {};
-
-	boolean includeInParent() default false;
-}
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.annotations;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ * @author Jonathan Yan
+ * @author Jakub Vavrik
+ * @author Kevin Leturc
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+@Documented
+@Inherited
+public @interface Field {
+
+	FieldType type() default FieldType.Auto;
+
+	FieldIndex index() default FieldIndex.analyzed;
+
+	DateFormat format() default DateFormat.none;
+
+	String pattern() default "";
+
+	boolean store() default false;
+
+	String searchAnalyzer() default "";
+
+	String analyzer() default "";
+
+	String[] ignoreFields() default {};
+
+	boolean includeInParent() default false;
+}

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

@@ -1,45 +1,45 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.*;
-
-/**
- * Query
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.METHOD)
-@Documented
-public @interface Query {
-
-	/**
-	 * Elasticsearch query to be used when executing query. May contain placeholders eg. ?0
-	 *
-	 * @return
-	 */
-	String value() default "";
-
-	/**
-	 * Named Query Named looked up by repository.
-	 *
-	 * @return
-	 */
-	String name() default "";
-}
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * Query
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+@Documented
+public @interface Query {
+
+	/**
+	 * Elasticsearch query to be used when executing query. May contain placeholders eg. ?0
+	 *
+	 * @return
+	 */
+	String value() default "";
+
+	/**
+	 * Named Query Named looked up by repository.
+	 *
+	 * @return
+	 */
+	String name() default "";
+}

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

@@ -1,127 +1,127 @@
-/*
- * 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 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);
+		}
+	}
+}

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

@@ -1,154 +1,154 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.client;
-
-import static org.apache.commons.lang.StringUtils.*;
-
-import java.net.InetAddress;
-import java.util.Properties;
-
-import org.elasticsearch.client.transport.TransportClient;
-import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.common.transport.InetSocketTransportAddress;
-import org.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 org.springframework.util.Assert;
-
-/**
- * TransportClientFactoryBean
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Jakub Vavrik
- * @author Piotr Betkier
- */
-
-public class TransportClientFactoryBean implements FactoryBean<TransportClient>, InitializingBean, DisposableBean {
-
-	private static final Logger logger = LoggerFactory.getLogger(TransportClientFactoryBean.class);
-	private String clusterNodes = "127.0.0.1:9300";
-	private String clusterName = "elasticsearch";
-	private Boolean clientTransportSniff = true;
-	private Boolean clientIgnoreClusterName = Boolean.FALSE;
-	private String clientPingTimeout = "5s";
-	private String clientNodesSamplerInterval = "5s";
-	private TransportClient client;
-	private Properties properties;
-	static final String COLON = ":";
-	static final String COMMA = ",";
-
-	@Override
-	public void destroy() throws Exception {
-		try {
-			logger.info("Closing elasticSearch  client");
-			if (client != null) {
-				client.close();
-			}
-		} catch (final Exception e) {
-			logger.error("Error closing ElasticSearch client: ", e);
-		}
-	}
-
-	@Override
-	public TransportClient getObject() throws Exception {
-		return client;
-	}
-
-	@Override
-	public Class<TransportClient> getObjectType() {
-		return TransportClient.class;
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return false;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		buildClient();
-	}
-
-	protected void buildClient() throws Exception {
-		client = TransportClient.builder().settings(settings()).build();
-		Assert.hasText(clusterNodes, "[Assertion failed] clusterNodes settings missing.");
-		for (String clusterNode : split(clusterNodes, COMMA)) {
-			String hostName = substringBeforeLast(clusterNode, COLON);
-			String port = substringAfterLast(clusterNode, COLON);
-			Assert.hasText(hostName, "[Assertion failed] missing host name in 'clusterNodes'");
-			Assert.hasText(port, "[Assertion failed] missing port in 'clusterNodes'");
-			logger.info("adding transport node : " + clusterNode);
-			client.addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(hostName), Integer.valueOf(port)));
-		}
-		client.connectedNodes();
-	}
-
-	private Settings settings() {
-		if (properties != null) {
-			return Settings.builder().put(properties).build();
-		}
-		return Settings.builder()
-				.put("cluster.name", clusterName)
-				.put("client.transport.sniff", clientTransportSniff)
-				.put("client.transport.ignore_cluster_name", clientIgnoreClusterName)
-				.put("client.transport.ping_timeout", clientPingTimeout)
-				.put("client.transport.nodes_sampler_interval", clientNodesSamplerInterval)
-				.build();
-	}
-
-	public void setClusterNodes(String clusterNodes) {
-		this.clusterNodes = clusterNodes;
-	}
-
-	public void setClusterName(String clusterName) {
-		this.clusterName = clusterName;
-	}
-
-	public void setClientTransportSniff(Boolean clientTransportSniff) {
-		this.clientTransportSniff = clientTransportSniff;
-	}
-
-	public String getClientNodesSamplerInterval() {
-		return clientNodesSamplerInterval;
-	}
-
-	public void setClientNodesSamplerInterval(String clientNodesSamplerInterval) {
-		this.clientNodesSamplerInterval = clientNodesSamplerInterval;
-	}
-
-	public String getClientPingTimeout() {
-		return clientPingTimeout;
-	}
-
-	public void setClientPingTimeout(String clientPingTimeout) {
-		this.clientPingTimeout = clientPingTimeout;
-	}
-
-	public Boolean getClientIgnoreClusterName() {
-		return clientIgnoreClusterName;
-	}
-
-	public void setClientIgnoreClusterName(Boolean clientIgnoreClusterName) {
-		this.clientIgnoreClusterName = clientIgnoreClusterName;
-	}
-
-	public void setProperties(Properties properties) {
-		this.properties = properties;
-	}
-}
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.client;
+
+import static org.apache.commons.lang.StringUtils.*;
+
+import java.net.InetAddress;
+import java.util.Properties;
+
+import org.elasticsearch.client.transport.TransportClient;
+import org.elasticsearch.common.settings.Settings;
+import org.elasticsearch.common.transport.InetSocketTransportAddress;
+import org.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 org.springframework.util.Assert;
+
+/**
+ * TransportClientFactoryBean
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Jakub Vavrik
+ * @author Piotr Betkier
+ */
+
+public class TransportClientFactoryBean implements FactoryBean<TransportClient>, InitializingBean, DisposableBean {
+
+	private static final Logger logger = LoggerFactory.getLogger(TransportClientFactoryBean.class);
+	private String clusterNodes = "127.0.0.1:9300";
+	private String clusterName = "elasticsearch";
+	private Boolean clientTransportSniff = true;
+	private Boolean clientIgnoreClusterName = Boolean.FALSE;
+	private String clientPingTimeout = "5s";
+	private String clientNodesSamplerInterval = "5s";
+	private TransportClient client;
+	private Properties properties;
+	static final String COLON = ":";
+	static final String COMMA = ",";
+
+	@Override
+	public void destroy() throws Exception {
+		try {
+			logger.info("Closing elasticSearch  client");
+			if (client != null) {
+				client.close();
+			}
+		} catch (final Exception e) {
+			logger.error("Error closing ElasticSearch client: ", e);
+		}
+	}
+
+	@Override
+	public TransportClient getObject() throws Exception {
+		return client;
+	}
+
+	@Override
+	public Class<TransportClient> getObjectType() {
+		return TransportClient.class;
+	}
+
+	@Override
+	public boolean isSingleton() {
+		return false;
+	}
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		buildClient();
+	}
+
+	protected void buildClient() throws Exception {
+		client = TransportClient.builder().settings(settings()).build();
+		Assert.hasText(clusterNodes, "[Assertion failed] clusterNodes settings missing.");
+		for (String clusterNode : split(clusterNodes, COMMA)) {
+			String hostName = substringBeforeLast(clusterNode, COLON);
+			String port = substringAfterLast(clusterNode, COLON);
+			Assert.hasText(hostName, "[Assertion failed] missing host name in 'clusterNodes'");
+			Assert.hasText(port, "[Assertion failed] missing port in 'clusterNodes'");
+			logger.info("adding transport node : " + clusterNode);
+			client.addTransportAddress(new InetSocketTransportAddress(InetAddress.getByName(hostName), Integer.valueOf(port)));
+		}
+		client.connectedNodes();
+	}
+
+	private Settings settings() {
+		if (properties != null) {
+			return Settings.builder().put(properties).build();
+		}
+		return Settings.builder()
+				.put("cluster.name", clusterName)
+				.put("client.transport.sniff", clientTransportSniff)
+				.put("client.transport.ignore_cluster_name", clientIgnoreClusterName)
+				.put("client.transport.ping_timeout", clientPingTimeout)
+				.put("client.transport.nodes_sampler_interval", clientNodesSamplerInterval)
+				.build();
+	}
+
+	public void setClusterNodes(String clusterNodes) {
+		this.clusterNodes = clusterNodes;
+	}
+
+	public void setClusterName(String clusterName) {
+		this.clusterName = clusterName;
+	}
+
+	public void setClientTransportSniff(Boolean clientTransportSniff) {
+		this.clientTransportSniff = clientTransportSniff;
+	}
+
+	public String getClientNodesSamplerInterval() {
+		return clientNodesSamplerInterval;
+	}
+
+	public void setClientNodesSamplerInterval(String clientNodesSamplerInterval) {
+		this.clientNodesSamplerInterval = clientNodesSamplerInterval;
+	}
+
+	public String getClientPingTimeout() {
+		return clientPingTimeout;
+	}
+
+	public void setClientPingTimeout(String clientPingTimeout) {
+		this.clientPingTimeout = clientPingTimeout;
+	}
+
+	public Boolean getClientIgnoreClusterName() {
+		return clientIgnoreClusterName;
+	}
+
+	public void setClientIgnoreClusterName(Boolean clientIgnoreClusterName) {
+		this.clientIgnoreClusterName = clientIgnoreClusterName;
+	}
+
+	public void setProperties(Properties properties) {
+		this.properties = properties;
+	}
+}

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

@@ -1,41 +1,41 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.config;
-
-import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
-import org.springframework.data.elasticsearch.repository.config.ElasticsearchRepositoryConfigExtension;
-import org.springframework.data.repository.config.RepositoryBeanDefinitionParser;
-import org.springframework.data.repository.config.RepositoryConfigurationExtension;
-
-/**
- * ElasticsearchNamespaceHandler
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public class ElasticsearchNamespaceHandler extends NamespaceHandlerSupport {
-
-	@Override
-	public void init() {
-		RepositoryConfigurationExtension extension = new ElasticsearchRepositoryConfigExtension();
-		RepositoryBeanDefinitionParser parser = new RepositoryBeanDefinitionParser(extension);
-
-		registerBeanDefinitionParser("repositories", parser);
-		registerBeanDefinitionParser("node-client", new NodeClientBeanDefinitionParser());
-		registerBeanDefinitionParser("transport-client", new TransportClientBeanDefinitionParser());
-	}
-}
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.config;
+
+import org.springframework.beans.factory.xml.NamespaceHandlerSupport;
+import org.springframework.data.elasticsearch.repository.config.ElasticsearchRepositoryConfigExtension;
+import org.springframework.data.repository.config.RepositoryBeanDefinitionParser;
+import org.springframework.data.repository.config.RepositoryConfigurationExtension;
+
+/**
+ * ElasticsearchNamespaceHandler
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public class ElasticsearchNamespaceHandler extends NamespaceHandlerSupport {
+
+	@Override
+	public void init() {
+		RepositoryConfigurationExtension extension = new ElasticsearchRepositoryConfigExtension();
+		RepositoryBeanDefinitionParser parser = new RepositoryBeanDefinitionParser(extension);
+
+		registerBeanDefinitionParser("repositories", parser);
+		registerBeanDefinitionParser("node-client", new NodeClientBeanDefinitionParser());
+		registerBeanDefinitionParser("transport-client", new TransportClientBeanDefinitionParser());
+	}
+}

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/config/TransportClientBeanDefinitionParser.java

@@ -1,56 +1,56 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.config;
-
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
-import org.springframework.beans.factory.xml.ParserContext;
-import org.springframework.data.elasticsearch.client.TransportClientFactoryBean;
-import org.w3c.dom.Element;
-
-/**
- * TransportClientBeanDefinitionParser
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public class TransportClientBeanDefinitionParser extends AbstractBeanDefinitionParser {
-
-	@Override
-	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(TransportClientFactoryBean.class);
-		setConfigurations(element, builder);
-		return getSourcedBeanDefinition(builder, element, parserContext);
-	}
-
-	private void setConfigurations(Element element, BeanDefinitionBuilder builder) {
-		builder.addPropertyValue("clusterNodes", element.getAttribute("cluster-nodes"));
-		builder.addPropertyValue("clusterName", element.getAttribute("cluster-name"));
-		builder.addPropertyValue("clientTransportSniff", Boolean.valueOf(element.getAttribute("client-transport-sniff")));
-		builder.addPropertyValue("clientIgnoreClusterName", Boolean.valueOf(element.getAttribute("client-transport-ignore-cluster-name")));
-		builder.addPropertyValue("clientPingTimeout", element.getAttribute("client-transport-ping-timeout"));
-		builder.addPropertyValue("clientNodesSamplerInterval", element.getAttribute("client-transport-nodes-sampler-interval"));
-	}
-
-	private AbstractBeanDefinition getSourcedBeanDefinition(BeanDefinitionBuilder builder, Element source,
-															ParserContext context) {
-		AbstractBeanDefinition definition = builder.getBeanDefinition();
-		definition.setSource(context.extractSource(source));
-		return definition;
-	}
-}
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.config;
+
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser;
+import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.data.elasticsearch.client.TransportClientFactoryBean;
+import org.w3c.dom.Element;
+
+/**
+ * TransportClientBeanDefinitionParser
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public class TransportClientBeanDefinitionParser extends AbstractBeanDefinitionParser {
+
+	@Override
+	protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) {
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(TransportClientFactoryBean.class);
+		setConfigurations(element, builder);
+		return getSourcedBeanDefinition(builder, element, parserContext);
+	}
+
+	private void setConfigurations(Element element, BeanDefinitionBuilder builder) {
+		builder.addPropertyValue("clusterNodes", element.getAttribute("cluster-nodes"));
+		builder.addPropertyValue("clusterName", element.getAttribute("cluster-name"));
+		builder.addPropertyValue("clientTransportSniff", Boolean.valueOf(element.getAttribute("client-transport-sniff")));
+		builder.addPropertyValue("clientIgnoreClusterName", Boolean.valueOf(element.getAttribute("client-transport-ignore-cluster-name")));
+		builder.addPropertyValue("clientPingTimeout", element.getAttribute("client-transport-ping-timeout"));
+		builder.addPropertyValue("clientNodesSamplerInterval", element.getAttribute("client-transport-nodes-sampler-interval"));
+	}
+
+	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/CriteriaQueryProcessor.java

@@ -1,210 +1,210 @@
-/*
- * 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.core;
-
-import static org.elasticsearch.index.query.QueryBuilders.*;
-import static org.springframework.data.elasticsearch.core.query.Criteria.*;
-
-import java.util.Iterator;
-import java.util.LinkedList;
-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.springframework.data.elasticsearch.core.query.Criteria;
-import org.springframework.util.Assert;
-
-/**
- * CriteriaQueryProcessor
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Franck Marchand
- * @author Artur Konczak
- */
-class CriteriaQueryProcessor {
-
-
-	QueryBuilder createQueryFromCriteria(Criteria criteria) {
-		if (criteria == null)
-			return null;
-
-		List<QueryBuilder> shouldQueryBuilderList = new LinkedList<QueryBuilder>();
-		List<QueryBuilder> mustNotQueryBuilderList = new LinkedList<QueryBuilder>();
-		List<QueryBuilder> mustQueryBuilderList = new LinkedList<QueryBuilder>();
-
-		ListIterator<Criteria> chainIterator = criteria.getCriteriaChain().listIterator();
-
-		QueryBuilder firstQuery = null;
-		boolean negateFirstQuery = false;
-
-		while (chainIterator.hasNext()) {
-			Criteria chainedCriteria = chainIterator.next();
-			QueryBuilder queryFragmentForCriteria = createQueryFragmentForCriteria(chainedCriteria);
-			if (queryFragmentForCriteria != null) {
-				if (firstQuery == null) {
-					firstQuery = queryFragmentForCriteria;
-					negateFirstQuery = chainedCriteria.isNegating();
-					continue;
-				}
-				if (chainedCriteria.isOr()) {
-					shouldQueryBuilderList.add(queryFragmentForCriteria);
-				} else if (chainedCriteria.isNegating()) {
-					mustNotQueryBuilderList.add(queryFragmentForCriteria);
-				} else {
-					mustQueryBuilderList.add(queryFragmentForCriteria);
-				}
-			}
-		}
-
-		if (firstQuery != null) {
-			if (!shouldQueryBuilderList.isEmpty() && mustNotQueryBuilderList.isEmpty() && mustQueryBuilderList.isEmpty()) {
-				shouldQueryBuilderList.add(0, firstQuery);
-			} else {
-				if (negateFirstQuery) {
-					mustNotQueryBuilderList.add(0, firstQuery);
-				} else {
-					mustQueryBuilderList.add(0, firstQuery);
-				}
-			}
-		}
-
-		BoolQueryBuilder query = null;
-
-		if (!shouldQueryBuilderList.isEmpty() || !mustNotQueryBuilderList.isEmpty() || !mustQueryBuilderList.isEmpty()) {
-
-			query = boolQuery();
-
-			for (QueryBuilder qb : shouldQueryBuilderList) {
-				query.should(qb);
-			}
-			for (QueryBuilder qb : mustNotQueryBuilderList) {
-				query.mustNot(qb);
-			}
-			for (QueryBuilder qb : mustQueryBuilderList) {
-				query.must(qb);
-			}
-		}
-
-		return query;
-	}
-
-
-	private QueryBuilder createQueryFragmentForCriteria(Criteria chainedCriteria) {
-		if (chainedCriteria.getQueryCriteriaEntries().isEmpty())
-			return null;
-
-		Iterator<Criteria.CriteriaEntry> it = chainedCriteria.getQueryCriteriaEntries().iterator();
-		boolean singeEntryCriteria = (chainedCriteria.getQueryCriteriaEntries().size() == 1);
-
-		String fieldName = chainedCriteria.getField().getName();
-		Assert.notNull(fieldName, "Unknown field");
-		QueryBuilder query = null;
-
-		if (singeEntryCriteria) {
-			Criteria.CriteriaEntry entry = it.next();
-			query = processCriteriaEntry(entry, fieldName);
-		} else {
-			query = boolQuery();
-			while (it.hasNext()) {
-				Criteria.CriteriaEntry entry = it.next();
-				((BoolQueryBuilder) query).must(processCriteriaEntry(entry, fieldName));
-			}
-		}
-
-		addBoost(query, chainedCriteria.getBoost());
-		return query;
-	}
-
-
-	private QueryBuilder processCriteriaEntry(Criteria.CriteriaEntry entry,/* OperationKey key, Object value,*/ String fieldName) {
-		Object value = entry.getValue();
-		if (value == null) {
-			return null;
-		}
-		OperationKey key = entry.getKey();
-		QueryBuilder query = null;
-
-		String searchText = StringUtils.toString(value);
-
-		Iterable<Object> collection = null;
-
-		switch (key) {
-			case EQUALS:
-				query = queryStringQuery(searchText).field(fieldName).defaultOperator(QueryStringQueryBuilder.Operator.AND);
-				break;
-			case CONTAINS:
-				query = queryStringQuery("*" + searchText + "*").field(fieldName).analyzeWildcard(true);
-				break;
-			case STARTS_WITH:
-				query = queryStringQuery(searchText + "*").field(fieldName).analyzeWildcard(true);
-				break;
-			case ENDS_WITH:
-				query = queryStringQuery("*" + searchText).field(fieldName).analyzeWildcard(true);
-				break;
-			case EXPRESSION:
-				query = queryStringQuery(searchText).field(fieldName);
-				break;
-			case LESS_EQUAL:
-				query = rangeQuery(fieldName).lte(value);
-				break;
-			case GREATER_EQUAL:
-				query = rangeQuery(fieldName).gte(value);
-				break;
-			case BETWEEN:
-				Object[] ranges = (Object[]) value;
-				query = rangeQuery(fieldName).from(ranges[0]).to(ranges[1]);
-				break;
-			case LESS:
-				query = rangeQuery(fieldName).lt(value);
-				break;
-			case GREATER:
-				query = rangeQuery(fieldName).gt(value);
-				break;
-			case FUZZY:
-				query = fuzzyQuery(fieldName, searchText);
-				break;
-			case IN:
-				query = boolQuery();
-				collection = (Iterable<Object>) value;
-				for (Object item : collection) {
-					((BoolQueryBuilder) query).should(queryStringQuery(item.toString()).field(fieldName));
-				}
-				break;
-			case NOT_IN:
-				query = boolQuery();
-				collection = (Iterable<Object>) value;
-				for (Object item : collection) {
-					((BoolQueryBuilder) query).mustNot(queryStringQuery(item.toString()).field(fieldName));
-				}
-				break;
-		}
-		return query;
-	}
-
-	private void addBoost(QueryBuilder query, float boost) {
-		if (Float.isNaN(boost)) {
-			return;
-		}
-		if (query instanceof BoostableQueryBuilder) {
-			((BoostableQueryBuilder) query).boost(boost);
-		}
-	}
-}
+/*
+ * 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.core;
+
+import static org.elasticsearch.index.query.QueryBuilders.*;
+import static org.springframework.data.elasticsearch.core.query.Criteria.*;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+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.springframework.data.elasticsearch.core.query.Criteria;
+import org.springframework.util.Assert;
+
+/**
+ * CriteriaQueryProcessor
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Franck Marchand
+ * @author Artur Konczak
+ */
+class CriteriaQueryProcessor {
+
+
+	QueryBuilder createQueryFromCriteria(Criteria criteria) {
+		if (criteria == null)
+			return null;
+
+		List<QueryBuilder> shouldQueryBuilderList = new LinkedList<QueryBuilder>();
+		List<QueryBuilder> mustNotQueryBuilderList = new LinkedList<QueryBuilder>();
+		List<QueryBuilder> mustQueryBuilderList = new LinkedList<QueryBuilder>();
+
+		ListIterator<Criteria> chainIterator = criteria.getCriteriaChain().listIterator();
+
+		QueryBuilder firstQuery = null;
+		boolean negateFirstQuery = false;
+
+		while (chainIterator.hasNext()) {
+			Criteria chainedCriteria = chainIterator.next();
+			QueryBuilder queryFragmentForCriteria = createQueryFragmentForCriteria(chainedCriteria);
+			if (queryFragmentForCriteria != null) {
+				if (firstQuery == null) {
+					firstQuery = queryFragmentForCriteria;
+					negateFirstQuery = chainedCriteria.isNegating();
+					continue;
+				}
+				if (chainedCriteria.isOr()) {
+					shouldQueryBuilderList.add(queryFragmentForCriteria);
+				} else if (chainedCriteria.isNegating()) {
+					mustNotQueryBuilderList.add(queryFragmentForCriteria);
+				} else {
+					mustQueryBuilderList.add(queryFragmentForCriteria);
+				}
+			}
+		}
+
+		if (firstQuery != null) {
+			if (!shouldQueryBuilderList.isEmpty() && mustNotQueryBuilderList.isEmpty() && mustQueryBuilderList.isEmpty()) {
+				shouldQueryBuilderList.add(0, firstQuery);
+			} else {
+				if (negateFirstQuery) {
+					mustNotQueryBuilderList.add(0, firstQuery);
+				} else {
+					mustQueryBuilderList.add(0, firstQuery);
+				}
+			}
+		}
+
+		BoolQueryBuilder query = null;
+
+		if (!shouldQueryBuilderList.isEmpty() || !mustNotQueryBuilderList.isEmpty() || !mustQueryBuilderList.isEmpty()) {
+
+			query = boolQuery();
+
+			for (QueryBuilder qb : shouldQueryBuilderList) {
+				query.should(qb);
+			}
+			for (QueryBuilder qb : mustNotQueryBuilderList) {
+				query.mustNot(qb);
+			}
+			for (QueryBuilder qb : mustQueryBuilderList) {
+				query.must(qb);
+			}
+		}
+
+		return query;
+	}
+
+
+	private QueryBuilder createQueryFragmentForCriteria(Criteria chainedCriteria) {
+		if (chainedCriteria.getQueryCriteriaEntries().isEmpty())
+			return null;
+
+		Iterator<Criteria.CriteriaEntry> it = chainedCriteria.getQueryCriteriaEntries().iterator();
+		boolean singeEntryCriteria = (chainedCriteria.getQueryCriteriaEntries().size() == 1);
+
+		String fieldName = chainedCriteria.getField().getName();
+		Assert.notNull(fieldName, "Unknown field");
+		QueryBuilder query = null;
+
+		if (singeEntryCriteria) {
+			Criteria.CriteriaEntry entry = it.next();
+			query = processCriteriaEntry(entry, fieldName);
+		} else {
+			query = boolQuery();
+			while (it.hasNext()) {
+				Criteria.CriteriaEntry entry = it.next();
+				((BoolQueryBuilder) query).must(processCriteriaEntry(entry, fieldName));
+			}
+		}
+
+		addBoost(query, chainedCriteria.getBoost());
+		return query;
+	}
+
+
+	private QueryBuilder processCriteriaEntry(Criteria.CriteriaEntry entry,/* OperationKey key, Object value,*/ String fieldName) {
+		Object value = entry.getValue();
+		if (value == null) {
+			return null;
+		}
+		OperationKey key = entry.getKey();
+		QueryBuilder query = null;
+
+		String searchText = StringUtils.toString(value);
+
+		Iterable<Object> collection = null;
+
+		switch (key) {
+			case EQUALS:
+				query = queryStringQuery(searchText).field(fieldName).defaultOperator(QueryStringQueryBuilder.Operator.AND);
+				break;
+			case CONTAINS:
+				query = queryStringQuery("*" + searchText + "*").field(fieldName).analyzeWildcard(true);
+				break;
+			case STARTS_WITH:
+				query = queryStringQuery(searchText + "*").field(fieldName).analyzeWildcard(true);
+				break;
+			case ENDS_WITH:
+				query = queryStringQuery("*" + searchText).field(fieldName).analyzeWildcard(true);
+				break;
+			case EXPRESSION:
+				query = queryStringQuery(searchText).field(fieldName);
+				break;
+			case LESS_EQUAL:
+				query = rangeQuery(fieldName).lte(value);
+				break;
+			case GREATER_EQUAL:
+				query = rangeQuery(fieldName).gte(value);
+				break;
+			case BETWEEN:
+				Object[] ranges = (Object[]) value;
+				query = rangeQuery(fieldName).from(ranges[0]).to(ranges[1]);
+				break;
+			case LESS:
+				query = rangeQuery(fieldName).lt(value);
+				break;
+			case GREATER:
+				query = rangeQuery(fieldName).gt(value);
+				break;
+			case FUZZY:
+				query = fuzzyQuery(fieldName, searchText);
+				break;
+			case IN:
+				query = boolQuery();
+				collection = (Iterable<Object>) value;
+				for (Object item : collection) {
+					((BoolQueryBuilder) query).should(queryStringQuery(item.toString()).field(fieldName));
+				}
+				break;
+			case NOT_IN:
+				query = boolQuery();
+				collection = (Iterable<Object>) value;
+				for (Object item : collection) {
+					((BoolQueryBuilder) query).mustNot(queryStringQuery(item.toString()).field(fieldName));
+				}
+				break;
+		}
+		return query;
+	}
+
+	private void addBoost(QueryBuilder query, float boost) {
+		if (Float.isNaN(boost)) {
+			return;
+		}
+		if (query instanceof BoostableQueryBuilder) {
+			((BoostableQueryBuilder) 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-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,29 +18,28 @@ package org.springframework.data.elasticsearch.core;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.lang.reflect.Method;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 
+import com.fasterxml.jackson.core.JsonEncoding;
+import com.fasterxml.jackson.core.JsonFactory;
+import com.fasterxml.jackson.core.JsonGenerator;
 import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.get.MultiGetItemResponse;
 import org.elasticsearch.action.get.MultiGetResponse;
 import org.elasticsearch.action.search.SearchResponse;
-import com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
 import org.elasticsearch.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;
@@ -48,6 +47,9 @@ import org.springframework.data.mapping.context.MappingContext;
 
 /**
  * @author Artur Konczak
+ * @author Petar Tahchiev
+ * @author Young Gu
+ * @author Oliver Gierke
  */
 public class DefaultResultMapper extends AbstractResultMapper {
 
@@ -74,7 +76,7 @@ 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>();
 		for (SearchHit hit : response.getHits()) {
@@ -86,38 +88,39 @@ 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());
 	}
 
-    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);
 	}
 
@@ -169,18 +172,15 @@ 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.getPersistentEntity(clazz);
+			PersistentProperty<?> 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/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,130 @@
+/*
+ * 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.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.elasticsearch.search.aggregations.Aggregation;
+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.*;
+
+/**
+ * Container for query result and facet results
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ * @author Jonathan Yan
+ */
+@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<String, FacetResult>();
+
+	public FacetedPageImpl(List<T> content) {
+		super(content);
+	}
+
+	public FacetedPageImpl(List<T> content, Pageable pageable, long total) {
+		super(content, pageable, 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) {
+			facets = new ArrayList<FacetResult>();
+			for (Aggregation agg : getAggregations()) {
+				if (agg instanceof Terms) {
+					List<Term> terms = new ArrayList<Term>();
+					for (Terms.Bucket t : ((Terms) agg).getBuckets()) {
+						terms.add(new Term(t.getKeyAsString(), t.getDocCount()));
+					}
+					addFacet(new TermResult(agg.getName(), terms, terms.size(), ((Terms) agg).getSumOfOtherDocCounts(), 0));
+				}
+				if (agg instanceof Range) {
+					List<? extends Range.Bucket> buckets = ((Range) agg).getBuckets();
+					List<org.springframework.data.elasticsearch.core.facet.result.Range> ranges = new ArrayList<org.springframework.data.elasticsearch.core.facet.result.Range>();
+					for (Range.Bucket b : buckets) {
+						ExtendedStats rStats = (ExtendedStats) b.getAggregations().get(AbstractFacetRequest.INTERNAL_STATS);
+						if (rStats != null) {
+							Sum 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));
+				}
+				if (agg instanceof ExtendedStats) {
+					ExtendedStats stats = (ExtendedStats) agg;
+					addFacet(new StatisticalResult(agg.getName(), stats.getCount(), stats.getMax(), stats.getMin(), stats.getAvg(), stats.getStdDeviation(), stats.getSumOfSquares(), stats.getSum(), stats.getVariance()));
+				}
+				if (agg instanceof Histogram) {
+					List<IntervalUnit> intervals = new ArrayList<IntervalUnit>();
+					for (Histogram.Bucket h : ((Histogram) agg).getBuckets()) {
+						ExtendedStats hStats = (ExtendedStats) 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,360 +1,361 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core;
-
-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.io.ClassPathResource;
-import org.springframework.data.annotation.Transient;
-import org.springframework.data.elasticsearch.annotations.*;
-import org.springframework.data.elasticsearch.core.completion.Completion;
-import org.springframework.data.elasticsearch.core.geo.GeoPoint;
-import org.springframework.data.mapping.model.SimpleTypeHolder;
-import org.springframework.data.util.ClassTypeInformation;
-import org.springframework.data.util.TypeInformation;
-
-/**
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Artur Konczak
- * @author Kevin Leturc
- * @author Alexander Volz
- * @author Dennis Maaß
- */
-
-class MappingBuilder {
-
-	public static final String FIELD_STORE = "store";
-	public static final String FIELD_TYPE = "type";
-	public static final String FIELD_INDEX = "index";
-	public static final String FIELD_FORMAT = "format";
-	public static final String FIELD_SEARCH_ANALYZER = "search_analyzer";
-	public static final String FIELD_INDEX_ANALYZER = "analyzer";
-	public static final String FIELD_PROPERTIES = "properties";
-	public static final String FIELD_PARENT = "_parent";
-
-	public static final String COMPLETION_PAYLOADS = "payloads";
-	public static final String COMPLETION_PRESERVE_SEPARATORS = "preserve_separators";
-	public static final String COMPLETION_PRESERVE_POSITION_INCREMENTS = "preserve_position_increments";
-	public static final String COMPLETION_MAX_INPUT_LENGTH = "max_input_length";
-
-	public static final String INDEX_VALUE_NOT_ANALYZED = "not_analyzed";
-	public static final String TYPE_VALUE_STRING = "string";
-	public static final String TYPE_VALUE_GEO_POINT = "geo_point";
-	public static final String TYPE_VALUE_COMPLETION = "completion";
-	public static final String TYPE_VALUE_GEO_HASH_PREFIX = "geohash_prefix";
-	public static final String TYPE_VALUE_GEO_HASH_PRECISION = "geohash_precision";
-
-	private static SimpleTypeHolder SIMPLE_TYPE_HOLDER = new SimpleTypeHolder();
-
-	static XContentBuilder buildMapping(Class clazz, String indexType, String idFieldName, String parentType) throws IOException {
-
-		XContentBuilder mapping = jsonBuilder().startObject().startObject(indexType);
-		// Parent
-		if (hasText(parentType)) {
-			mapping.startObject(FIELD_PARENT).field(FIELD_TYPE, parentType).endObject();
-		}
-
-		// Properties
-		XContentBuilder xContentBuilder = mapping.startObject(FIELD_PROPERTIES);
-
-		mapEntity(xContentBuilder, clazz, true, idFieldName, EMPTY, false, FieldType.Auto, null);
-
-		return xContentBuilder.endObject().endObject().endObject();
-	}
-
-	private static void mapEntity(XContentBuilder xContentBuilder, Class clazz, boolean isRootObject, String idFieldName,
-								  String nestedObjectFieldName, boolean nestedOrObjectField, FieldType fieldType, Field fieldAnnotation) throws IOException {
-
-		java.lang.reflect.Field[] fields = retrieveFields(clazz);
-
-		if (!isRootObject && (isAnyPropertyAnnotatedAsField(fields) || nestedOrObjectField)) {
-			String type = FieldType.Object.toString().toLowerCase();
-			if (nestedOrObjectField) {
-				type = fieldType.toString().toLowerCase();
-			}
-			XContentBuilder t = xContentBuilder.startObject(nestedObjectFieldName).field(FIELD_TYPE, type);
-
-			if (nestedOrObjectField && FieldType.Nested == fieldType && fieldAnnotation.includeInParent()) {
-				t.field("include_in_parent", fieldAnnotation.includeInParent());
-			}
-			t.startObject(FIELD_PROPERTIES);
-		}
-
-		for (java.lang.reflect.Field field : fields) {
-
-			if (field.isAnnotationPresent(Transient.class) || isInIgnoreFields(field)) {
-				continue;
-			}
-
-			if (field.isAnnotationPresent(Mapping.class)) {
-				String mappingPath = field.getAnnotation(Mapping.class).mappingPath();
-				if (isNotBlank(mappingPath)) {
-					ClassPathResource mappings = new ClassPathResource(mappingPath);
-					if (mappings.exists()) {
-						xContentBuilder.rawField(field.getName(), mappings.getInputStream());
-						continue;
-					}
-				}
-			}
-
-			boolean isGeoPointField = isGeoPointField(field);
-			boolean isCompletionField = isCompletionField(field);
-
-			Field singleField = field.getAnnotation(Field.class);
-			if (!isGeoPointField && !isCompletionField && isEntity(field) && isAnnotated(field)) {
-				if (singleField == null) {
-					continue;
-				}
-				boolean nestedOrObject = isNestedOrObjectField(field);
-				mapEntity(xContentBuilder, getFieldType(field), false, EMPTY, field.getName(), nestedOrObject, singleField.type(), field.getAnnotation(Field.class));
-				if (nestedOrObject) {
-					continue;
-				}
-			}
-
-			MultiField multiField = field.getAnnotation(MultiField.class);
-
-			if (isGeoPointField) {
-				applyGeoPointFieldMapping(xContentBuilder, field);
-			}
-
-			if (isCompletionField) {
-				CompletionField completionField = field.getAnnotation(CompletionField.class);
-				applyCompletionFieldMapping(xContentBuilder, field, completionField);
-			}
-
-			if (isRootObject && singleField != null && isIdField(field, idFieldName)) {
-				applyDefaultIdFieldMapping(xContentBuilder, field);
-			} else if (multiField != null) {
-				addMultiFieldMapping(xContentBuilder, field, multiField, isNestedOrObjectField(field));
-			} else if (singleField != null) {
-				addSingleFieldMapping(xContentBuilder, field, singleField, isNestedOrObjectField(field));
-			}
-		}
-
-		if (!isRootObject && isAnyPropertyAnnotatedAsField(fields) || nestedOrObjectField) {
-			xContentBuilder.endObject().endObject();
-		}
-	}
-
-	private static java.lang.reflect.Field[] retrieveFields(Class clazz) {
-		// Create list of fields.
-		List<java.lang.reflect.Field> fields = new ArrayList<java.lang.reflect.Field>();
-
-		// Keep backing up the inheritance hierarchy.
-		Class targetClass = clazz;
-		do {
-			fields.addAll(Arrays.asList(targetClass.getDeclaredFields()));
-			targetClass = targetClass.getSuperclass();
-		}
-		while (targetClass != null && targetClass != Object.class);
-
-		return fields.toArray(new java.lang.reflect.Field[fields.size()]);
-	}
-
-	private static boolean isAnnotated(java.lang.reflect.Field field) {
-		return field.getAnnotation(Field.class) != null ||
-				field.getAnnotation(MultiField.class) != null ||
-				field.getAnnotation(GeoPointField.class) != null ||
-				field.getAnnotation(CompletionField.class) != null;
-	}
-
-	private static void applyGeoPointFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field) throws IOException {
-		xContentBuilder.startObject(field.getName());
-		xContentBuilder.field(FIELD_TYPE, TYPE_VALUE_GEO_POINT);
-
-		GeoPointField annotation = field.getAnnotation(GeoPointField.class);
-		if (annotation != null) {
-			if (annotation.geoHashPrefix()) {
-				xContentBuilder.field(TYPE_VALUE_GEO_HASH_PREFIX, true);
-				if (StringUtils.isNotEmpty(annotation.geoHashPrecision())) {
-					if (NumberUtils.isNumber(annotation.geoHashPrecision())) {
-						xContentBuilder.field(TYPE_VALUE_GEO_HASH_PRECISION, Integer.parseInt(annotation.geoHashPrecision()));
-					} else {
-						xContentBuilder.field(TYPE_VALUE_GEO_HASH_PRECISION, annotation.geoHashPrecision());
-					}
-				}
-			}
-		}
-
-		xContentBuilder.endObject();
-	}
-
-	private static void applyCompletionFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field, CompletionField annotation) throws IOException {
-		xContentBuilder.startObject(field.getName());
-		xContentBuilder.field(FIELD_TYPE, TYPE_VALUE_COMPLETION);
-		if (annotation != null) {
-			xContentBuilder.field(COMPLETION_MAX_INPUT_LENGTH, annotation.maxInputLength());
-			xContentBuilder.field(COMPLETION_PAYLOADS, annotation.payloads());
-			xContentBuilder.field(COMPLETION_PRESERVE_POSITION_INCREMENTS, annotation.preservePositionIncrements());
-			xContentBuilder.field(COMPLETION_PRESERVE_SEPARATORS, annotation.preserveSeparators());
-			if (isNotBlank(annotation.searchAnalyzer())) {
-				xContentBuilder.field(FIELD_SEARCH_ANALYZER, annotation.searchAnalyzer());
-			}
-			if (isNotBlank(annotation.analyzer())) {
-				xContentBuilder.field(FIELD_INDEX_ANALYZER, annotation.analyzer());
-			}
-		}
-		xContentBuilder.endObject();
-	}
-
-	private static void applyDefaultIdFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field)
-			throws IOException {
-		xContentBuilder.startObject(field.getName())
-				.field(FIELD_TYPE, TYPE_VALUE_STRING)
-				.field(FIELD_INDEX, INDEX_VALUE_NOT_ANALYZED);
-		xContentBuilder.endObject();
-	}
-
-	/**
-	 * Apply mapping for a single @Field annotation
-	 *
-	 * @throws IOException
-	 */
-	private static void addSingleFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field,
-											  Field fieldAnnotation, boolean nestedOrObjectField) throws IOException {
-		xContentBuilder.startObject(field.getName());
-		if(!nestedOrObjectField) {
-			xContentBuilder.field(FIELD_STORE, fieldAnnotation.store());
-		}
-		if (FieldType.Auto != fieldAnnotation.type()) {
-			xContentBuilder.field(FIELD_TYPE, fieldAnnotation.type().name().toLowerCase());
-			if (FieldType.Date == fieldAnnotation.type() && DateFormat.none != fieldAnnotation.format()) {
-				xContentBuilder.field(FIELD_FORMAT, DateFormat.custom == fieldAnnotation.format()
-						? fieldAnnotation.pattern() : fieldAnnotation.format());
-			}
-		}
-		if (FieldIndex.not_analyzed == fieldAnnotation.index() || FieldIndex.no == fieldAnnotation.index()) {
-			xContentBuilder.field(FIELD_INDEX, fieldAnnotation.index().name().toLowerCase());
-		}
-		if (isNotBlank(fieldAnnotation.searchAnalyzer())) {
-			xContentBuilder.field(FIELD_SEARCH_ANALYZER, fieldAnnotation.searchAnalyzer());
-		}
-		if (isNotBlank(fieldAnnotation.analyzer())) {
-			xContentBuilder.field(FIELD_INDEX_ANALYZER, fieldAnnotation.analyzer());
-		}
-		xContentBuilder.endObject();
-	}
-
-	/**
-	 * Apply mapping for a single nested @Field annotation
-	 *
-	 * @throws IOException
-	 */
-	private static void addNestedFieldMapping(XContentBuilder builder, java.lang.reflect.Field field,
-											  InnerField annotation) throws IOException {
-		builder.startObject(annotation.suffix());
-		//builder.field(FIELD_STORE, annotation.store());
-		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 (isNotBlank(annotation.searchAnalyzer())) {
-			builder.field(FIELD_SEARCH_ANALYZER, annotation.searchAnalyzer());
-		}
-		if (isNotBlank(annotation.indexAnalyzer())) {
-			builder.field(FIELD_INDEX_ANALYZER, annotation.indexAnalyzer());
-		}
-		builder.endObject();
-	}
-
-	/**
-	 * Multi field mappings for string type fields, support for sorts and facets
-	 *
-	 * @throws IOException
-	 */
-	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.startObject("fields");
-		//add standard field
-		addSingleFieldMapping(builder, field, annotation.mainField(),nestedOrObjectField);
-		for (InnerField innerField : annotation.otherFields()) {
-			addNestedFieldMapping(builder, field, innerField);
-		}
-		builder.endObject();
-		builder.endObject();
-	}
-
-	protected static boolean isEntity(java.lang.reflect.Field field) {
-		TypeInformation typeInformation = ClassTypeInformation.from(field.getType());
-		Class<?> clazz = getFieldType(field);
-		boolean isComplexType = !SIMPLE_TYPE_HOLDER.isSimpleType(clazz);
-		return isComplexType && !Map.class.isAssignableFrom(typeInformation.getType());
-	}
-
-	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();
-		}
-		return clazz;
-	}
-
-	private static boolean isAnyPropertyAnnotatedAsField(java.lang.reflect.Field[] fields) {
-		if (fields != null) {
-			for (java.lang.reflect.Field field : fields) {
-				if (field.isAnnotationPresent(Field.class)) {
-					return true;
-				}
-			}
-		}
-		return false;
-	}
-
-	private static boolean isIdField(java.lang.reflect.Field field, String idFieldName) {
-		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();
-			return Arrays.asList(ignoreFields).contains(field.getName());
-		}
-		return false;
-	}
-
-	private static boolean isNestedOrObjectField(java.lang.reflect.Field field) {
-		Field fieldAnnotation = field.getAnnotation(Field.class);
-		return fieldAnnotation != null && (FieldType.Nested == fieldAnnotation.type() || FieldType.Object == fieldAnnotation.type());
-	}
-
-	private static boolean isGeoPointField(java.lang.reflect.Field field) {
-		return field.getType() == GeoPoint.class || field.getAnnotation(GeoPointField.class) != null;
-	}
-
-	private static boolean isCompletionField(java.lang.reflect.Field field) {
-		return field.getType() == Completion.class;
-	}
-}
+/*
+ * Copyright 2014-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core;
+
+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.io.ClassPathResource;
+import org.springframework.data.annotation.Transient;
+import org.springframework.data.elasticsearch.annotations.*;
+import org.springframework.data.elasticsearch.annotations.Field;
+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;
+
+/**
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ * @author Kevin Leturc
+ * @author Alexander Volz
+ * @author Dennis Maaß
+ * @author Pavel Luhin
+ * @author Oliver Gierke
+ */
+
+class MappingBuilder {
+
+	public static final String FIELD_STORE = "store";
+	public static final String FIELD_TYPE = "type";
+	public static final String FIELD_INDEX = "index";
+	public static final String FIELD_FORMAT = "format";
+	public static final String FIELD_SEARCH_ANALYZER = "search_analyzer";
+	public static final String FIELD_INDEX_ANALYZER = "analyzer";
+	public static final String FIELD_PROPERTIES = "properties";
+	public static final String FIELD_PARENT = "_parent";
+
+	public static final String COMPLETION_PAYLOADS = "payloads";
+	public static final String COMPLETION_PRESERVE_SEPARATORS = "preserve_separators";
+	public static final String COMPLETION_PRESERVE_POSITION_INCREMENTS = "preserve_position_increments";
+	public static final String COMPLETION_MAX_INPUT_LENGTH = "max_input_length";
+
+	public static final String INDEX_VALUE_NOT_ANALYZED = "not_analyzed";
+	public static final String TYPE_VALUE_STRING = "string";
+	public static final String TYPE_VALUE_GEO_POINT = "geo_point";
+	public static final String TYPE_VALUE_COMPLETION = "completion";
+	public static final String TYPE_VALUE_GEO_HASH_PREFIX = "geohash_prefix";
+	public static final String TYPE_VALUE_GEO_HASH_PRECISION = "geohash_precision";
+
+	private static SimpleTypeHolder SIMPLE_TYPE_HOLDER = new SimpleTypeHolder();
+
+	static XContentBuilder buildMapping(Class clazz, String indexType, String idFieldName, String parentType) throws IOException {
+
+		XContentBuilder mapping = jsonBuilder().startObject().startObject(indexType);
+		// Parent
+		if (hasText(parentType)) {
+			mapping.startObject(FIELD_PARENT).field(FIELD_TYPE, parentType).endObject();
+		}
+
+		// Properties
+		XContentBuilder xContentBuilder = mapping.startObject(FIELD_PROPERTIES);
+
+		mapEntity(xContentBuilder, clazz, true, idFieldName, EMPTY, false, FieldType.Auto, null);
+
+		return xContentBuilder.endObject().endObject().endObject();
+	}
+
+	private static void mapEntity(XContentBuilder xContentBuilder, Class clazz, boolean isRootObject, String idFieldName,
+								  String nestedObjectFieldName, boolean nestedOrObjectField, FieldType fieldType, Field fieldAnnotation) throws IOException {
+
+		java.lang.reflect.Field[] fields = retrieveFields(clazz);
+
+		if (!isRootObject && (isAnyPropertyAnnotatedAsField(fields) || nestedOrObjectField)) {
+			String type = FieldType.Object.toString().toLowerCase();
+			if (nestedOrObjectField) {
+				type = fieldType.toString().toLowerCase();
+			}
+			XContentBuilder t = xContentBuilder.startObject(nestedObjectFieldName).field(FIELD_TYPE, type);
+
+			if (nestedOrObjectField && FieldType.Nested == fieldType && fieldAnnotation.includeInParent()) {
+				t.field("include_in_parent", fieldAnnotation.includeInParent());
+			}
+			t.startObject(FIELD_PROPERTIES);
+		}
+
+		for (java.lang.reflect.Field field : fields) {
+
+			if (field.isAnnotationPresent(Transient.class) || isInIgnoreFields(field, fieldAnnotation)) {
+				continue;
+			}
+
+			if (field.isAnnotationPresent(Mapping.class)) {
+				String mappingPath = field.getAnnotation(Mapping.class).mappingPath();
+				if (isNotBlank(mappingPath)) {
+					ClassPathResource mappings = new ClassPathResource(mappingPath);
+					if (mappings.exists()) {
+						xContentBuilder.rawField(field.getName(), mappings.getInputStream());
+						continue;
+					}
+				}
+			}
+
+			boolean isGeoPointField = isGeoPointField(field);
+			boolean isCompletionField = isCompletionField(field);
+
+			Field singleField = field.getAnnotation(Field.class);
+			if (!isGeoPointField && !isCompletionField && isEntity(field) && isAnnotated(field)) {
+				if (singleField == null) {
+					continue;
+				}
+				boolean nestedOrObject = isNestedOrObjectField(field);
+				mapEntity(xContentBuilder, getFieldType(field), false, EMPTY, field.getName(), nestedOrObject, singleField.type(), field.getAnnotation(Field.class));
+				if (nestedOrObject) {
+					continue;
+				}
+			}
+
+			MultiField multiField = field.getAnnotation(MultiField.class);
+
+			if (isGeoPointField) {
+				applyGeoPointFieldMapping(xContentBuilder, field);
+			}
+
+			if (isCompletionField) {
+				CompletionField completionField = field.getAnnotation(CompletionField.class);
+				applyCompletionFieldMapping(xContentBuilder, field, completionField);
+			}
+
+			if (isRootObject && singleField != null && isIdField(field, idFieldName)) {
+				applyDefaultIdFieldMapping(xContentBuilder, field);
+			} else if (multiField != null) {
+				addMultiFieldMapping(xContentBuilder, field, multiField, isNestedOrObjectField(field));
+			} else if (singleField != null) {
+				addSingleFieldMapping(xContentBuilder, field, singleField, isNestedOrObjectField(field));
+			}
+		}
+
+		if (!isRootObject && isAnyPropertyAnnotatedAsField(fields) || nestedOrObjectField) {
+			xContentBuilder.endObject().endObject();
+		}
+	}
+
+	private static java.lang.reflect.Field[] retrieveFields(Class clazz) {
+		// Create list of fields.
+		List<java.lang.reflect.Field> fields = new ArrayList<java.lang.reflect.Field>();
+
+		// Keep backing up the inheritance hierarchy.
+		Class targetClass = clazz;
+		do {
+			fields.addAll(Arrays.asList(targetClass.getDeclaredFields()));
+			targetClass = targetClass.getSuperclass();
+		}
+		while (targetClass != null && targetClass != Object.class);
+
+		return fields.toArray(new java.lang.reflect.Field[fields.size()]);
+	}
+
+	private static boolean isAnnotated(java.lang.reflect.Field field) {
+		return field.getAnnotation(Field.class) != null ||
+				field.getAnnotation(MultiField.class) != null ||
+				field.getAnnotation(GeoPointField.class) != null ||
+				field.getAnnotation(CompletionField.class) != null;
+	}
+
+	private static void applyGeoPointFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field) throws IOException {
+		xContentBuilder.startObject(field.getName());
+		xContentBuilder.field(FIELD_TYPE, TYPE_VALUE_GEO_POINT);
+
+		GeoPointField annotation = field.getAnnotation(GeoPointField.class);
+		if (annotation != null) {
+			if (annotation.geoHashPrefix()) {
+				xContentBuilder.field(TYPE_VALUE_GEO_HASH_PREFIX, true);
+				if (StringUtils.isNotEmpty(annotation.geoHashPrecision())) {
+					if (NumberUtils.isNumber(annotation.geoHashPrecision())) {
+						xContentBuilder.field(TYPE_VALUE_GEO_HASH_PRECISION, Integer.parseInt(annotation.geoHashPrecision()));
+					} else {
+						xContentBuilder.field(TYPE_VALUE_GEO_HASH_PRECISION, annotation.geoHashPrecision());
+					}
+				}
+			}
+		}
+
+		xContentBuilder.endObject();
+	}
+
+	private static void applyCompletionFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field, CompletionField annotation) throws IOException {
+		xContentBuilder.startObject(field.getName());
+		xContentBuilder.field(FIELD_TYPE, TYPE_VALUE_COMPLETION);
+		if (annotation != null) {
+			xContentBuilder.field(COMPLETION_MAX_INPUT_LENGTH, annotation.maxInputLength());
+			xContentBuilder.field(COMPLETION_PAYLOADS, annotation.payloads());
+			xContentBuilder.field(COMPLETION_PRESERVE_POSITION_INCREMENTS, annotation.preservePositionIncrements());
+			xContentBuilder.field(COMPLETION_PRESERVE_SEPARATORS, annotation.preserveSeparators());
+			if (isNotBlank(annotation.searchAnalyzer())) {
+				xContentBuilder.field(FIELD_SEARCH_ANALYZER, annotation.searchAnalyzer());
+			}
+			if (isNotBlank(annotation.analyzer())) {
+				xContentBuilder.field(FIELD_INDEX_ANALYZER, annotation.analyzer());
+			}
+		}
+		xContentBuilder.endObject();
+	}
+
+	private static void applyDefaultIdFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field)
+			throws IOException {
+		xContentBuilder.startObject(field.getName())
+				.field(FIELD_TYPE, TYPE_VALUE_STRING)
+				.field(FIELD_INDEX, INDEX_VALUE_NOT_ANALYZED);
+		xContentBuilder.endObject();
+	}
+
+	/**
+	 * Apply mapping for a single @Field annotation
+	 *
+	 * @throws IOException
+	 */
+	private static void addSingleFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field,
+											  Field fieldAnnotation, boolean nestedOrObjectField) throws IOException {
+		xContentBuilder.startObject(field.getName());
+		if(!nestedOrObjectField) {
+			xContentBuilder.field(FIELD_STORE, fieldAnnotation.store());
+		}
+		if (FieldType.Auto != fieldAnnotation.type()) {
+			xContentBuilder.field(FIELD_TYPE, fieldAnnotation.type().name().toLowerCase());
+			if (FieldType.Date == fieldAnnotation.type() && DateFormat.none != fieldAnnotation.format()) {
+				xContentBuilder.field(FIELD_FORMAT, DateFormat.custom == fieldAnnotation.format()
+						? fieldAnnotation.pattern() : fieldAnnotation.format());
+			}
+		}
+		if (FieldIndex.not_analyzed == fieldAnnotation.index() || FieldIndex.no == fieldAnnotation.index()) {
+			xContentBuilder.field(FIELD_INDEX, fieldAnnotation.index().name().toLowerCase());
+		}
+		if (isNotBlank(fieldAnnotation.searchAnalyzer())) {
+			xContentBuilder.field(FIELD_SEARCH_ANALYZER, fieldAnnotation.searchAnalyzer());
+		}
+		if (isNotBlank(fieldAnnotation.analyzer())) {
+			xContentBuilder.field(FIELD_INDEX_ANALYZER, fieldAnnotation.analyzer());
+		}
+		xContentBuilder.endObject();
+	}
+
+	/**
+	 * Apply mapping for a single nested @Field annotation
+	 *
+	 * @throws IOException
+	 */
+	private static void addNestedFieldMapping(XContentBuilder builder, java.lang.reflect.Field field,
+											  InnerField annotation) throws IOException {
+		builder.startObject(annotation.suffix());
+		//builder.field(FIELD_STORE, annotation.store());
+		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 (isNotBlank(annotation.searchAnalyzer())) {
+			builder.field(FIELD_SEARCH_ANALYZER, annotation.searchAnalyzer());
+		}
+		if (isNotBlank(annotation.indexAnalyzer())) {
+			builder.field(FIELD_INDEX_ANALYZER, annotation.indexAnalyzer());
+		}
+		builder.endObject();
+	}
+
+	/**
+	 * Multi field mappings for string type fields, support for sorts and facets
+	 *
+	 * @throws IOException
+	 */
+	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.startObject("fields");
+		//add standard field
+		addSingleFieldMapping(builder, field, annotation.mainField(),nestedOrObjectField);
+		for (InnerField innerField : annotation.otherFields()) {
+			addNestedFieldMapping(builder, field, innerField);
+		}
+		builder.endObject();
+		builder.endObject();
+	}
+
+	protected static boolean isEntity(java.lang.reflect.Field field) {
+		
+		TypeInformation<?> typeInformation = ClassTypeInformation.from(field.getType());
+		Class<?> clazz = getFieldType(field);
+		boolean isComplexType = !SIMPLE_TYPE_HOLDER.isSimpleType(clazz);
+		return isComplexType && !typeInformation.isMap();
+	}
+
+	protected static Class<?> getFieldType(java.lang.reflect.Field field) {
+		
+		return ClassTypeInformation.from(field.getDeclaringClass()) //
+				.getProperty(field.getName()) //
+				.getActualType() //
+				.getType();
+	}
+
+	private static boolean isAnyPropertyAnnotatedAsField(java.lang.reflect.Field[] fields) {
+		if (fields != null) {
+			for (java.lang.reflect.Field field : fields) {
+				if (field.isAnnotationPresent(Field.class)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	private static boolean isIdField(java.lang.reflect.Field field, String idFieldName) {
+		return idFieldName.equals(field.getName());
+	}
+
+	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;
+	}
+
+	private static boolean isNestedOrObjectField(java.lang.reflect.Field field) {
+		Field fieldAnnotation = field.getAnnotation(Field.class);
+		return fieldAnnotation != null && (FieldType.Nested == fieldAnnotation.type() || FieldType.Object == fieldAnnotation.type());
+	}
+
+	private static boolean isGeoPointField(java.lang.reflect.Field field) {
+		return field.getType() == GeoPoint.class || field.getAnnotation(GeoPointField.class) != null;
+	}
+
+	private static boolean isCompletionField(java.lang.reflect.Field field) {
+		return field.getType() == Completion.class;
+	}
+}

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

@@ -1,24 +1,24 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.elasticsearch.core;
-
-import org.elasticsearch.action.search.SearchResponse;
-
-public interface ResultsExtractor<T> {
-
-	T extract(SearchResponse response);
-}
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.elasticsearch.core;
+
+import org.elasticsearch.action.search.SearchResponse;
+
+public interface ResultsExtractor<T> {
+
+	T extract(SearchResponse response);
+}

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

@@ -1,29 +1,29 @@
-/*
- * 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;
-
-/**
- * ResultsMapper
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Artur Konczak
- */
-
-public interface ResultsMapper extends SearchResultMapper, GetResultMapper, MultiGetResultMapper {
-
-	EntityMapper getEntityMapper();
-}
+/*
+ * 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;
+
+/**
+ * ResultsMapper
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ */
+
+public interface ResultsMapper extends SearchResultMapper, GetResultMapper, MultiGetResultMapper {
+
+	EntityMapper getEntityMapper();
+}

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,17 @@
+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;
+
+/**
+ * @author Petar Tahchiev
+ */
+public interface AggregatedPage<T> extends FacetedPage<T> {
+
+	boolean hasAggregations();
+
+	Aggregations getAggregations();
+
+	Aggregation getAggregation(String name);
+}

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

@@ -0,0 +1,55 @@
+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<String, Aggregation>();
+
+	public AggregatedPageImpl(List<T> content) {
+		super(content);
+	}
+
+	public AggregatedPageImpl(List<T> content, Pageable pageable, long total) {
+		super(content, pageable, total);
+	}
+
+	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);
+			}
+		}
+	}
+
+	@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);
+	}
+}

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

@@ -1,77 +1,77 @@
-/*
- * 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.core.convert;
-
-import java.util.Date;
-
-import org.joda.time.DateTimeZone;
-import org.joda.time.LocalDateTime;
-import org.joda.time.ReadableInstant;
-import org.joda.time.format.DateTimeFormatter;
-import org.joda.time.format.ISODateTimeFormat;
-import org.springframework.core.convert.converter.Converter;
-
-/**
- * DateTimeConverters
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public final class DateTimeConverters {
-
-	private static DateTimeFormatter formatter = ISODateTimeFormat.dateTime().withZone(DateTimeZone.UTC);
-
-	public enum JodaDateTimeConverter implements Converter<ReadableInstant, String> {
-		INSTANCE;
-
-		@Override
-		public String convert(ReadableInstant source) {
-			if (source == null) {
-				return null;
-			}
-			return formatter.print(source);
-		}
-
-	}
-
-	public enum JodaLocalDateTimeConverter implements Converter<LocalDateTime, String> {
-		INSTANCE;
-
-		@Override
-		public String convert(LocalDateTime source) {
-			if (source == null) {
-				return null;
-			}
-			return formatter.print(source.toDateTime(DateTimeZone.UTC));
-		}
-
-	}
-
-	public enum JavaDateConverter implements Converter<Date, String> {
-		INSTANCE;
-
-		@Override
-		public String convert(Date source) {
-			if (source == null) {
-				return null;
-			}
-
-			return formatter.print(source.getTime());
-		}
-
-	}
-}
+/*
+ * 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.core.convert;
+
+import java.util.Date;
+
+import org.joda.time.DateTimeZone;
+import org.joda.time.LocalDateTime;
+import org.joda.time.ReadableInstant;
+import org.joda.time.format.DateTimeFormatter;
+import org.joda.time.format.ISODateTimeFormat;
+import org.springframework.core.convert.converter.Converter;
+
+/**
+ * DateTimeConverters
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public final class DateTimeConverters {
+
+	private static DateTimeFormatter formatter = ISODateTimeFormat.dateTime().withZone(DateTimeZone.UTC);
+
+	public enum JodaDateTimeConverter implements Converter<ReadableInstant, String> {
+		INSTANCE;
+
+		@Override
+		public String convert(ReadableInstant source) {
+			if (source == null) {
+				return null;
+			}
+			return formatter.print(source);
+		}
+
+	}
+
+	public enum JodaLocalDateTimeConverter implements Converter<LocalDateTime, String> {
+		INSTANCE;
+
+		@Override
+		public String convert(LocalDateTime source) {
+			if (source == null) {
+				return null;
+			}
+			return formatter.print(source.toDateTime(DateTimeZone.UTC));
+		}
+
+	}
+
+	public enum JavaDateConverter implements Converter<Date, String> {
+		INSTANCE;
+
+		@Override
+		public String convert(Date source) {
+			if (source == null) {
+				return null;
+			}
+
+			return formatter.print(source.getTime());
+		}
+
+	}
+}

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

@@ -1,45 +1,45 @@
-/*
- * 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.core.convert;
-
-import org.springframework.core.convert.ConversionService;
-import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
-import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
-import org.springframework.data.mapping.context.MappingContext;
-
-/**
- * ElasticsearchConverter
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public interface ElasticsearchConverter {
-
-	/**
-	 * Returns the underlying {@link org.springframework.data.mapping.context.MappingContext} used by the converter.
-	 *
-	 * @return never {@literal null}
-	 */
-	MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> getMappingContext();
-
-	/**
-	 * Returns the underlying {@link org.springframework.core.convert.ConversionService} used by the converter.
-	 *
-	 * @return never {@literal null}.
-	 */
-	ConversionService getConversionService();
-}
+/*
+ * 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.core.convert;
+
+import org.springframework.core.convert.ConversionService;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
+import org.springframework.data.mapping.context.MappingContext;
+
+/**
+ * ElasticsearchConverter
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public interface ElasticsearchConverter {
+
+	/**
+	 * Returns the underlying {@link org.springframework.data.mapping.context.MappingContext} used by the converter.
+	 *
+	 * @return never {@literal null}
+	 */
+	MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> getMappingContext();
+
+	/**
+	 * Returns the underlying {@link org.springframework.core.convert.ConversionService} used by the converter.
+	 *
+	 * @return never {@literal null}.
+	 */
+	ConversionService getConversionService();
+}

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

@@ -1,68 +1,70 @@
-/*
- * 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.core.convert;
-
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.core.convert.ConversionService;
-import org.springframework.core.convert.support.DefaultConversionService;
-import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
-import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.util.Assert;
-
-/**
- * MappingElasticsearchConverter
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public class MappingElasticsearchConverter implements ElasticsearchConverter, ApplicationContextAware {
-
-	private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext;
-	private final GenericConversionService conversionService;
-
-	@SuppressWarnings("unused")
-	private ApplicationContext applicationContext;
-
-	public MappingElasticsearchConverter(
-			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
-		Assert.notNull(mappingContext);
-		this.mappingContext = mappingContext;
-		this.conversionService = new DefaultConversionService();
-	}
-
-	@Override
-	public MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> getMappingContext() {
-		return mappingContext;
-	}
-
-	@Override
-	public ConversionService getConversionService() {
-		return this.conversionService;
-	}
-
-	@Override
-	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-		this.applicationContext = applicationContext;
-		if (mappingContext instanceof ApplicationContextAware) {
-			((ApplicationContextAware) mappingContext).setApplicationContext(applicationContext);
-		}
-	}
-}
+/*
+ * 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.convert;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.core.convert.ConversionService;
+import org.springframework.core.convert.support.DefaultConversionService;
+import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.util.Assert;
+
+/**
+ * MappingElasticsearchConverter
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Mark Paluch
+ */
+public class MappingElasticsearchConverter implements ElasticsearchConverter, ApplicationContextAware {
+
+	private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext;
+	private final GenericConversionService conversionService;
+
+	@SuppressWarnings("unused")
+	private ApplicationContext applicationContext;
+
+	public MappingElasticsearchConverter(
+			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
+		
+		Assert.notNull(mappingContext, "MappingContext must not be null!");
+		
+		this.mappingContext = mappingContext;
+		this.conversionService = new DefaultConversionService();
+	}
+
+	@Override
+	public MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> getMappingContext() {
+		return mappingContext;
+	}
+
+	@Override
+	public ConversionService getConversionService() {
+		return this.conversionService;
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+		this.applicationContext = applicationContext;
+		if (mappingContext instanceof ApplicationContextAware) {
+			((ApplicationContextAware) mappingContext).setApplicationContext(applicationContext);
+		}
+	}
+}

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

@@ -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.DateHistogramBuilder;
+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 !!!");
+
+		DateHistogramBuilder dateHistogramBuilder = AggregationBuilders.dateHistogram(getName());
+		dateHistogramBuilder.field(field);
+
+		if (timeUnit != null) {
+			dateHistogramBuilder.interval(timeUnit);
+		} else {
+			dateHistogramBuilder.interval(interval);
+		}
+
+		dateHistogramBuilder.subAggregation(AggregationBuilders.extendedStats(INTERNAL_STATS));
+
+		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,132 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.elasticsearch.core.facet.request;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
+import org.elasticsearch.search.aggregations.AggregationBuilders;
+import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
+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<Entry>();
+
+	public RangeFacetRequest(String name) {
+		super(name);
+	}
+
+	public void setField(String field) {
+		this.field = field;
+	}
+
+	public void setFields(String keyField, String valueField) {
+		this.keyField = keyField;
+		this.valueField = valueField;
+	}
+
+	public void range(Double from, Double to) {
+		entries.add(new DoubleEntry(from, to));
+	}
+
+	public void range(String from, String to) {
+		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 !!!");
+
+		RangeBuilder rangeBuilder = AggregationBuilders.range(getName());
+		rangeBuilder.field(StringUtils.isNotBlank(keyField) ? keyField : 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));
+		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,107 @@
+/*
+ * Copyright 2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.elasticsearch.core.facet.request;
+
+import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.StringUtils;
+import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
+import org.elasticsearch.search.aggregations.AggregationBuilders;
+import org.elasticsearch.search.aggregations.bucket.terms.Terms;
+import org.elasticsearch.search.aggregations.bucket.terms.TermsBuilder;
+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 !!!");
+		TermsBuilder 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.exclude(excludeTerms);
+		}
+
+		if (allTerms) {
+			termsBuilder.size(Integer.MAX_VALUE);
+		}
+
+		if (StringUtils.isNotBlank(regex)) {
+			termsBuilder.include(regex);
+		}
+
+		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/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-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();
+}

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

@@ -1,40 +1,40 @@
-/*
- * 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.core.mapping;
-
-import org.springframework.core.convert.converter.Converter;
-import org.springframework.data.mapping.PersistentProperty;
-
-/**
- * ElasticsearchPersistentProperty
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public interface ElasticsearchPersistentProperty extends PersistentProperty<ElasticsearchPersistentProperty> {
-
-	String getFieldName();
-
-	public enum PropertyToFieldNameConverter implements Converter<ElasticsearchPersistentProperty, String> {
-
-		INSTANCE;
-
-		public String convert(ElasticsearchPersistentProperty source) {
-			return source.getFieldName();
-		}
-	}
-}
+/*
+ * 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.core.mapping;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.mapping.PersistentProperty;
+
+/**
+ * ElasticsearchPersistentProperty
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public interface ElasticsearchPersistentProperty extends PersistentProperty<ElasticsearchPersistentProperty> {
+
+	String getFieldName();
+
+	public enum PropertyToFieldNameConverter implements Converter<ElasticsearchPersistentProperty, String> {
+
+		INSTANCE;
+
+		public String convert(ElasticsearchPersistentProperty source) {
+			return source.getFieldName();
+		}
+	}
+}

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

@@ -1,60 +1,60 @@
-/*
- * 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.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.SimpleTypeHolder;
-import org.springframework.data.util.TypeInformation;
-
-/**
- * SimpleElasticsearchMappingContext
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public class SimpleElasticsearchMappingContext extends
-		AbstractMappingContext<SimpleElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> implements ApplicationContextAware {
-
-	private ApplicationContext context;
-
-	@Override
-	protected <T> SimpleElasticsearchPersistentEntity<?> createPersistentEntity(TypeInformation<T> typeInformation) {
-		final SimpleElasticsearchPersistentEntity<T> persistentEntity =
-				new SimpleElasticsearchPersistentEntity<T>(typeInformation);
-		if (context != null) {
-			persistentEntity.setApplicationContext(context);
-		}
-		return persistentEntity;
-	}
-
-	@Override
-	protected ElasticsearchPersistentProperty createPersistentProperty(Field field, PropertyDescriptor descriptor,
-																	   SimpleElasticsearchPersistentEntity<?> owner, SimpleTypeHolder simpleTypeHolder) {
-		return new SimpleElasticsearchPersistentProperty(field, descriptor, owner, simpleTypeHolder);
-	}
-
-	@Override
-	public void setApplicationContext(ApplicationContext context) throws BeansException {
-		this.context = context;
-	}
-}
+/*
+ * 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.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.SimpleTypeHolder;
+import org.springframework.data.util.TypeInformation;
+
+/**
+ * SimpleElasticsearchMappingContext
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public class SimpleElasticsearchMappingContext extends
+		AbstractMappingContext<SimpleElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> implements ApplicationContextAware {
+
+	private ApplicationContext context;
+
+	@Override
+	protected <T> SimpleElasticsearchPersistentEntity<?> createPersistentEntity(TypeInformation<T> typeInformation) {
+		final SimpleElasticsearchPersistentEntity<T> persistentEntity =
+				new SimpleElasticsearchPersistentEntity<T>(typeInformation);
+		if (context != null) {
+			persistentEntity.setApplicationContext(context);
+		}
+		return persistentEntity;
+	}
+
+	@Override
+	protected ElasticsearchPersistentProperty createPersistentProperty(Field field, PropertyDescriptor descriptor,
+																	   SimpleElasticsearchPersistentEntity<?> owner, SimpleTypeHolder simpleTypeHolder) {
+		return new SimpleElasticsearchPersistentProperty(field, descriptor, owner, simpleTypeHolder);
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext context) throws BeansException {
+		this.context = context;
+	}
+}

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

@@ -1,170 +1,170 @@
-/*
- * 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-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");
+		}
+	}
+}

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

@@ -1,65 +1,65 @@
-/*
- * 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.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.SimpleTypeHolder;
-
-/**
- * Elasticsearch specific {@link org.springframework.data.mapping.PersistentProperty} implementation processing
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-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>();
-
-	static {
-		SUPPORTED_ID_TYPES.add(String.class);
-		SUPPORTED_ID_PROPERTY_NAMES.add("id");
-		SUPPORTED_ID_PROPERTY_NAMES.add("documentId");
-	}
-
-	public SimpleElasticsearchPersistentProperty(Field field, PropertyDescriptor propertyDescriptor,
-												 PersistentEntity<?, ElasticsearchPersistentProperty> owner, SimpleTypeHolder simpleTypeHolder) {
-		super(field, propertyDescriptor, owner, simpleTypeHolder);
-	}
-
-	@Override
-	public String getFieldName() {
-		return field.getName();
-	}
-
-	@Override
-	public boolean isIdProperty() {
-		return super.isIdProperty() || (field != null ? SUPPORTED_ID_PROPERTY_NAMES.contains(getFieldName()) : false);
-	}
-
-	@Override
-	protected Association<ElasticsearchPersistentProperty> createAssociation() {
-		return null;
-	}
-}
+/*
+ * 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.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.SimpleTypeHolder;
+
+/**
+ * Elasticsearch specific {@link org.springframework.data.mapping.PersistentProperty} implementation processing
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+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>();
+
+	static {
+		SUPPORTED_ID_TYPES.add(String.class);
+		SUPPORTED_ID_PROPERTY_NAMES.add("id");
+		SUPPORTED_ID_PROPERTY_NAMES.add("documentId");
+	}
+
+	public SimpleElasticsearchPersistentProperty(Field field, PropertyDescriptor propertyDescriptor,
+												 PersistentEntity<?, ElasticsearchPersistentProperty> owner, SimpleTypeHolder simpleTypeHolder) {
+		super(field, propertyDescriptor, owner, simpleTypeHolder);
+	}
+
+	@Override
+	public String getFieldName() {
+		return field.getName();
+	}
+
+	@Override
+	public boolean isIdProperty() {
+		return super.isIdProperty() || (field != null ? SUPPORTED_ID_PROPERTY_NAMES.contains(getFieldName()) : false);
+	}
+
+	@Override
+	protected Association<ElasticsearchPersistentProperty> createAssociation() {
+		return null;
+	}
+}

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,6 +29,7 @@ import org.springframework.util.Assert;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
+ * @author Mark Paluch
  */
 abstract class AbstractQuery implements Query {
 
@@ -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/AliasBuilder.java

@@ -1,81 +1,81 @@
-/*
- * 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.query;
-
-import java.util.Map;
-
-import org.elasticsearch.index.query.QueryBuilder;
-
-/**
- * @author Mohsin Husen
- */
-public class AliasBuilder {
-
-	private String indexName;
-	private String aliasName;
-	private QueryBuilder filterBuilder;
-	private Map<String, Object> filter;
-	private String searchRouting;
-	private String indexRouting;
-	private String routing;
-
-	public AliasBuilder withIndexName(String indexName) {
-		this.indexName = indexName;
-		return this;
-	}
-
-	public AliasBuilder withAliasName(String aliasName) {
-		this.aliasName = aliasName;
-		return this;
-	}
-
-	public AliasBuilder withFilterBuilder(QueryBuilder filterBuilder) {
-		this.filterBuilder = filterBuilder;
-		return this;
-	}
-
-	public AliasBuilder withFilter(Map<String, Object> filter) {
-		this.filter = filter;
-		return this;
-	}
-
-	public AliasBuilder withSearchRouting(String searchRouting) {
-		this.searchRouting = searchRouting;
-		return this;
-	}
-
-	public AliasBuilder withIndexRouting(String indexRouting) {
-		this.indexRouting = indexRouting;
-		return this;
-	}
-
-	public AliasBuilder withRouting(String routing) {
-		this.routing = routing;
-		return this;
-	}
-
-	public AliasQuery build() {
-		AliasQuery aliasQuery = new AliasQuery();
-		aliasQuery.setIndexName(indexName);
-		aliasQuery.setAliasName(aliasName);
-		aliasQuery.setFilterBuilder(filterBuilder);
-		aliasQuery.setFilter(filter);
-		aliasQuery.setSearchRouting(searchRouting);
-		aliasQuery.setIndexRouting(indexRouting);
-		aliasQuery.setRouting(routing);
-		return aliasQuery;
-	}
-}
+/*
+ * 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.query;
+
+import java.util.Map;
+
+import org.elasticsearch.index.query.QueryBuilder;
+
+/**
+ * @author Mohsin Husen
+ */
+public class AliasBuilder {
+
+	private String indexName;
+	private String aliasName;
+	private QueryBuilder filterBuilder;
+	private Map<String, Object> filter;
+	private String searchRouting;
+	private String indexRouting;
+	private String routing;
+
+	public AliasBuilder withIndexName(String indexName) {
+		this.indexName = indexName;
+		return this;
+	}
+
+	public AliasBuilder withAliasName(String aliasName) {
+		this.aliasName = aliasName;
+		return this;
+	}
+
+	public AliasBuilder withFilterBuilder(QueryBuilder filterBuilder) {
+		this.filterBuilder = filterBuilder;
+		return this;
+	}
+
+	public AliasBuilder withFilter(Map<String, Object> filter) {
+		this.filter = filter;
+		return this;
+	}
+
+	public AliasBuilder withSearchRouting(String searchRouting) {
+		this.searchRouting = searchRouting;
+		return this;
+	}
+
+	public AliasBuilder withIndexRouting(String indexRouting) {
+		this.indexRouting = indexRouting;
+		return this;
+	}
+
+	public AliasBuilder withRouting(String routing) {
+		this.routing = routing;
+		return this;
+	}
+
+	public AliasQuery build() {
+		AliasQuery aliasQuery = new AliasQuery();
+		aliasQuery.setIndexName(indexName);
+		aliasQuery.setAliasName(aliasName);
+		aliasQuery.setFilterBuilder(filterBuilder);
+		aliasQuery.setFilter(filter);
+		aliasQuery.setSearchRouting(searchRouting);
+		aliasQuery.setIndexRouting(indexRouting);
+		aliasQuery.setRouting(routing);
+		return aliasQuery;
+	}
+}

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

@@ -1,92 +1,92 @@
-/*
- * 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.query;
-
-import java.util.Map;
-
-import org.elasticsearch.index.query.QueryBuilder;
-
-/**
- * AliasQuery is useful for creating new alias or deleting existing ones
- *
- * @author Mohsin Husen
- */
-public class AliasQuery {
-
-	private String indexName;
-	private String aliasName;
-	private QueryBuilder filterBuilder;
-	private Map<String, Object> filter;
-	private String searchRouting;
-	private String indexRouting;
-	private String routing;
-
-	public String getIndexName() {
-		return indexName;
-	}
-
-	public void setIndexName(String indexName) {
-		this.indexName = indexName;
-	}
-
-	public String getAliasName() {
-		return aliasName;
-	}
-
-	public void setAliasName(String aliasName) {
-		this.aliasName = aliasName;
-	}
-
-	public QueryBuilder getFilterBuilder() {
-		return filterBuilder;
-	}
-
-	public void setFilterBuilder(QueryBuilder filterBuilder) {
-		this.filterBuilder = filterBuilder;
-	}
-
-	public Map<String, Object> getFilter() {
-		return filter;
-	}
-
-	public void setFilter(Map<String, Object> filter) {
-		this.filter = filter;
-	}
-
-	public String getSearchRouting() {
-		return searchRouting;
-	}
-
-	public void setSearchRouting(String searchRouting) {
-		this.searchRouting = searchRouting;
-	}
-
-	public String getIndexRouting() {
-		return indexRouting;
-	}
-
-	public void setIndexRouting(String indexRouting) {
-		this.indexRouting = indexRouting;
-	}
-
-	public String getRouting() {
-		return routing;
-	}
-
-	public void setRouting(String routing) {
-		this.routing = routing;
-	}
-}
+/*
+ * 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.query;
+
+import java.util.Map;
+
+import org.elasticsearch.index.query.QueryBuilder;
+
+/**
+ * AliasQuery is useful for creating new alias or deleting existing ones
+ *
+ * @author Mohsin Husen
+ */
+public class AliasQuery {
+
+	private String indexName;
+	private String aliasName;
+	private QueryBuilder filterBuilder;
+	private Map<String, Object> filter;
+	private String searchRouting;
+	private String indexRouting;
+	private String routing;
+
+	public String getIndexName() {
+		return indexName;
+	}
+
+	public void setIndexName(String indexName) {
+		this.indexName = indexName;
+	}
+
+	public String getAliasName() {
+		return aliasName;
+	}
+
+	public void setAliasName(String aliasName) {
+		this.aliasName = aliasName;
+	}
+
+	public QueryBuilder getFilterBuilder() {
+		return filterBuilder;
+	}
+
+	public void setFilterBuilder(QueryBuilder filterBuilder) {
+		this.filterBuilder = filterBuilder;
+	}
+
+	public Map<String, Object> getFilter() {
+		return filter;
+	}
+
+	public void setFilter(Map<String, Object> filter) {
+		this.filter = filter;
+	}
+
+	public String getSearchRouting() {
+		return searchRouting;
+	}
+
+	public void setSearchRouting(String searchRouting) {
+		this.searchRouting = searchRouting;
+	}
+
+	public String getIndexRouting() {
+		return indexRouting;
+	}
+
+	public void setIndexRouting(String indexRouting) {
+		this.indexRouting = indexRouting;
+	}
+
+	public String getRouting() {
+		return routing;
+	}
+
+	public void setRouting(String routing) {
+		this.routing = routing;
+	}
+}

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

@@ -1,80 +1,80 @@
-/*
- * 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.core.query;
-
-import org.springframework.data.domain.Pageable;
-import org.springframework.util.Assert;
-
-/**
- * CriteriaQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public class CriteriaQuery extends AbstractQuery {
-
-	private Criteria criteria;
-
-	private CriteriaQuery() {
-	}
-
-	public CriteriaQuery(Criteria criteria) {
-		this(criteria, null);
-	}
-
-	public CriteriaQuery(Criteria criteria, Pageable pageable) {
-		this.criteria = criteria;
-		this.pageable = pageable;
-		if (pageable != null) {
-			this.addSort(pageable.getSort());
-		}
-	}
-
-	public static final Query fromQuery(CriteriaQuery source) {
-		return fromQuery(source, new CriteriaQuery());
-	}
-
-	public static <T extends CriteriaQuery> T fromQuery(CriteriaQuery source, T destination) {
-		if (source == null || destination == null) {
-			return null;
-		}
-
-		if (source.getCriteria() != null) {
-			destination.addCriteria(source.getCriteria());
-		}
-
-		if (source.getSort() != null) {
-			destination.addSort(source.getSort());
-		}
-
-		return destination;
-	}
-
-	@SuppressWarnings("unchecked")
-	public final <T extends CriteriaQuery> T addCriteria(Criteria criteria) {
-		Assert.notNull(criteria, "Cannot add null criteria.");
-		if (this.criteria == null) {
-			this.criteria = criteria;
-		} else {
-			this.criteria.and(criteria);
-		}
-		return (T) this;
-	}
-
-	public Criteria getCriteria() {
-		return this.criteria;
-	}
-}
+/*
+ * 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.core.query;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.util.Assert;
+
+/**
+ * CriteriaQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class CriteriaQuery extends AbstractQuery {
+
+	private Criteria criteria;
+
+	private CriteriaQuery() {
+	}
+
+	public CriteriaQuery(Criteria criteria) {
+		this(criteria, null);
+	}
+
+	public CriteriaQuery(Criteria criteria, Pageable pageable) {
+		this.criteria = criteria;
+		this.pageable = pageable;
+		if (pageable != null) {
+			this.addSort(pageable.getSort());
+		}
+	}
+
+	public static final Query fromQuery(CriteriaQuery source) {
+		return fromQuery(source, new CriteriaQuery());
+	}
+
+	public static <T extends CriteriaQuery> T fromQuery(CriteriaQuery source, T destination) {
+		if (source == null || destination == null) {
+			return null;
+		}
+
+		if (source.getCriteria() != null) {
+			destination.addCriteria(source.getCriteria());
+		}
+
+		if (source.getSort() != null) {
+			destination.addSort(source.getSort());
+		}
+
+		return destination;
+	}
+
+	@SuppressWarnings("unchecked")
+	public final <T extends CriteriaQuery> T addCriteria(Criteria criteria) {
+		Assert.notNull(criteria, "Cannot add null criteria.");
+		if (this.criteria == null) {
+			this.criteria = criteria;
+		} else {
+			this.criteria.and(criteria);
+		}
+		return (T) this;
+	}
+
+	public Criteria getCriteria() {
+		return this.criteria;
+	}
+}

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

@@ -1,73 +1,73 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-import org.elasticsearch.index.query.QueryBuilder;
-
-/**
- * DeleteQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public class DeleteQuery {
-
-	private QueryBuilder query;
-	private String index;
-	private String type;
-	private Integer pageSize;
-	private Long scrollTimeInMillis;
-
-	public QueryBuilder getQuery() {
-		return query;
-	}
-
-	public void setQuery(QueryBuilder query) {
-		this.query = query;
-	}
-
-	public String getIndex() {
-		return index;
-	}
-
-	public void setIndex(String index) {
-		this.index = index;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public Integer getPageSize() {
-		return pageSize;
-	}
-
-	public void setPageSize(Integer pageSize) {
-		this.pageSize = pageSize;
-	}
-
-	public Long getScrollTimeInMillis() {
-		return scrollTimeInMillis;
-	}
-
-	public void setScrollTimeInMillis(Long scrollTimeInMillis) {
-		this.scrollTimeInMillis = scrollTimeInMillis;
-	}
-}
+/*
+ * Copyright 2013-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+import org.elasticsearch.index.query.QueryBuilder;
+
+/**
+ * DeleteQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class DeleteQuery {
+
+	private QueryBuilder query;
+	private String index;
+	private String type;
+	private Integer pageSize;
+	private Long scrollTimeInMillis;
+
+	public QueryBuilder getQuery() {
+		return query;
+	}
+
+	public void setQuery(QueryBuilder query) {
+		this.query = query;
+	}
+
+	public String getIndex() {
+		return index;
+	}
+
+	public void setIndex(String index) {
+		this.index = index;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public Integer getPageSize() {
+		return pageSize;
+	}
+
+	public void setPageSize(Integer pageSize) {
+		this.pageSize = pageSize;
+	}
+
+	public Long getScrollTimeInMillis() {
+		return scrollTimeInMillis;
+	}
+
+	public void setScrollTimeInMillis(Long scrollTimeInMillis) {
+		this.scrollTimeInMillis = scrollTimeInMillis;
+	}
+}

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

@@ -1,32 +1,32 @@
-/*
- * 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.core.query;
-
-/**
- * Defines a Field that can be used within a Criteria.
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public interface Field {
-
-	/**
-	 * Get the name of the field used in schema.xml of elasticsearch server
-	 *
-	 * @return
-	 */
-	String getName();
-}
+/*
+ * 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.core.query;
+
+/**
+ * Defines a Field that can be used within a Criteria.
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public interface Field {
+
+	/**
+	 * Get the name of the field used in schema.xml of elasticsearch server
+	 *
+	 * @return
+	 */
+	String getName();
+}

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

@@ -1,35 +1,35 @@
-/*
- * 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.core.query;
-
-/**
- * GetQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public class GetQuery {
-
-	private String id;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-}
+/*
+ * 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.core.query;
+
+/**
+ * GetQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class GetQuery {
+
+	private String id;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+}

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

@@ -1,90 +1,90 @@
-/*
- * 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.core.query;
-
-/**
- * IndexQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public class IndexQuery {
-
-	private String id;
-	private Object object;
-	private Long version;
-	private String indexName;
-	private String type;
-	private String source;
-	private String parentId;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public Object getObject() {
-		return object;
-	}
-
-	public void setObject(Object object) {
-		this.object = object;
-	}
-
-	public Long getVersion() {
-		return version;
-	}
-
-	public void setVersion(Long version) {
-		this.version = version;
-	}
-
-	public String getIndexName() {
-		return indexName;
-	}
-
-	public void setIndexName(String indexName) {
-		this.indexName = indexName;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String getSource() {
-		return source;
-	}
-
-	public void setSource(String source) {
-		this.source = source;
-	}
-
-	public String getParentId() {
-		return parentId;
-	}
-
-	public void setParentId(String parentId) {
-		this.parentId = parentId;
-	}
-}
+/*
+ * 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.core.query;
+
+/**
+ * IndexQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public class IndexQuery {
+
+	private String id;
+	private Object object;
+	private Long version;
+	private String indexName;
+	private String type;
+	private String source;
+	private String parentId;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public Object getObject() {
+		return object;
+	}
+
+	public void setObject(Object object) {
+		this.object = object;
+	}
+
+	public Long getVersion() {
+		return version;
+	}
+
+	public void setVersion(Long version) {
+		this.version = version;
+	}
+
+	public String getIndexName() {
+		return indexName;
+	}
+
+	public void setIndexName(String indexName) {
+		this.indexName = indexName;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getSource() {
+		return source;
+	}
+
+	public void setSource(String source) {
+		this.source = source;
+	}
+
+	public String getParentId() {
+		return parentId;
+	}
+
+	public void setParentId(String parentId) {
+		this.parentId = parentId;
+	}
+}

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

@@ -1,188 +1,188 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-import static java.util.Collections.addAll;
-import static org.springframework.data.elasticsearch.core.query.AbstractQuery.*;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.data.domain.Pageable;
-
-/**
- * MoreLikeThisQuery
- *
- * @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 String routing;
-	private Float percentTermsToMatch;
-	private Integer minTermFreq;
-	private Integer maxQueryTerms;
-	private List<String> stopWords = new ArrayList<String>();
-	private Integer minDocFreq;
-	private Integer maxDocFreq;
-	private Integer minWordLen;
-	private Integer maxWordLen;
-	private Float boostTerms;
-	private Pageable pageable = DEFAULT_PAGE;
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public String getIndexName() {
-		return indexName;
-	}
-
-	public void setIndexName(String indexName) {
-		this.indexName = indexName;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public List<String> getSearchIndices() {
-		return searchIndices;
-	}
-
-	public void addSearchIndices(String... searchIndices) {
-		addAll(this.searchIndices, searchIndices);
-	}
-
-	public List<String> getSearchTypes() {
-		return searchTypes;
-	}
-
-	public void addSearchTypes(String... searchTypes) {
-		addAll(this.searchTypes, searchTypes);
-	}
-
-	public List<String> getFields() {
-		return fields;
-	}
-
-	public void addFields(String... fields) {
-		addAll(this.fields, fields);
-	}
-
-	public String getRouting() {
-		return routing;
-	}
-
-	public void setRouting(String routing) {
-		this.routing = routing;
-	}
-
-	public Float getPercentTermsToMatch() {
-		return percentTermsToMatch;
-	}
-
-	public void setPercentTermsToMatch(Float percentTermsToMatch) {
-		this.percentTermsToMatch = percentTermsToMatch;
-	}
-
-	public Integer getMinTermFreq() {
-		return minTermFreq;
-	}
-
-	public void setMinTermFreq(Integer minTermFreq) {
-		this.minTermFreq = minTermFreq;
-	}
-
-	public Integer getMaxQueryTerms() {
-		return maxQueryTerms;
-	}
-
-	public void setMaxQueryTerms(Integer maxQueryTerms) {
-		this.maxQueryTerms = maxQueryTerms;
-	}
-
-	public List<String> getStopWords() {
-		return stopWords;
-	}
-
-	public void addStopWords(String... stopWords) {
-		addAll(this.stopWords, stopWords);
-	}
-
-	public Integer getMinDocFreq() {
-		return minDocFreq;
-	}
-
-	public void setMinDocFreq(Integer minDocFreq) {
-		this.minDocFreq = minDocFreq;
-	}
-
-	public Integer getMaxDocFreq() {
-		return maxDocFreq;
-	}
-
-	public void setMaxDocFreq(Integer maxDocFreq) {
-		this.maxDocFreq = maxDocFreq;
-	}
-
-	public Integer getMinWordLen() {
-		return minWordLen;
-	}
-
-	public void setMinWordLen(Integer minWordLen) {
-		this.minWordLen = minWordLen;
-	}
-
-	public Integer getMaxWordLen() {
-		return maxWordLen;
-	}
-
-	public void setMaxWordLen(Integer maxWordLen) {
-		this.maxWordLen = maxWordLen;
-	}
-
-	public Float getBoostTerms() {
-		return boostTerms;
-	}
-
-	public void setBoostTerms(Float boostTerms) {
-		this.boostTerms = boostTerms;
-	}
-
-	public Pageable getPageable() {
-		return pageable;
-	}
-
-	public void setPageable(Pageable pageable) {
-		this.pageable = pageable;
-	}
-}
+/*
+ * Copyright 2013-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+import static java.util.Collections.addAll;
+import static org.springframework.data.elasticsearch.core.query.AbstractQuery.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.data.domain.Pageable;
+
+/**
+ * MoreLikeThisQuery
+ *
+ * @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 String routing;
+	private Float percentTermsToMatch;
+	private Integer minTermFreq;
+	private Integer maxQueryTerms;
+	private List<String> stopWords = new ArrayList<String>();
+	private Integer minDocFreq;
+	private Integer maxDocFreq;
+	private Integer minWordLen;
+	private Integer maxWordLen;
+	private Float boostTerms;
+	private Pageable pageable = DEFAULT_PAGE;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getIndexName() {
+		return indexName;
+	}
+
+	public void setIndexName(String indexName) {
+		this.indexName = indexName;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public List<String> getSearchIndices() {
+		return searchIndices;
+	}
+
+	public void addSearchIndices(String... searchIndices) {
+		addAll(this.searchIndices, searchIndices);
+	}
+
+	public List<String> getSearchTypes() {
+		return searchTypes;
+	}
+
+	public void addSearchTypes(String... searchTypes) {
+		addAll(this.searchTypes, searchTypes);
+	}
+
+	public List<String> getFields() {
+		return fields;
+	}
+
+	public void addFields(String... fields) {
+		addAll(this.fields, fields);
+	}
+
+	public String getRouting() {
+		return routing;
+	}
+
+	public void setRouting(String routing) {
+		this.routing = routing;
+	}
+
+	public Float getPercentTermsToMatch() {
+		return percentTermsToMatch;
+	}
+
+	public void setPercentTermsToMatch(Float percentTermsToMatch) {
+		this.percentTermsToMatch = percentTermsToMatch;
+	}
+
+	public Integer getMinTermFreq() {
+		return minTermFreq;
+	}
+
+	public void setMinTermFreq(Integer minTermFreq) {
+		this.minTermFreq = minTermFreq;
+	}
+
+	public Integer getMaxQueryTerms() {
+		return maxQueryTerms;
+	}
+
+	public void setMaxQueryTerms(Integer maxQueryTerms) {
+		this.maxQueryTerms = maxQueryTerms;
+	}
+
+	public List<String> getStopWords() {
+		return stopWords;
+	}
+
+	public void addStopWords(String... stopWords) {
+		addAll(this.stopWords, stopWords);
+	}
+
+	public Integer getMinDocFreq() {
+		return minDocFreq;
+	}
+
+	public void setMinDocFreq(Integer minDocFreq) {
+		this.minDocFreq = minDocFreq;
+	}
+
+	public Integer getMaxDocFreq() {
+		return maxDocFreq;
+	}
+
+	public void setMaxDocFreq(Integer maxDocFreq) {
+		this.maxDocFreq = maxDocFreq;
+	}
+
+	public Integer getMinWordLen() {
+		return minWordLen;
+	}
+
+	public void setMinWordLen(Integer minWordLen) {
+		this.minWordLen = minWordLen;
+	}
+
+	public Integer getMaxWordLen() {
+		return maxWordLen;
+	}
+
+	public void setMaxWordLen(Integer maxWordLen) {
+		this.maxWordLen = maxWordLen;
+	}
+
+	public Float getBoostTerms() {
+		return boostTerms;
+	}
+
+	public void setBoostTerms(Float boostTerms) {
+		this.boostTerms = boostTerms;
+	}
+
+	public Pageable getPageable() {
+		return pageable;
+	}
+
+	public void setPageable(Pageable pageable) {
+		this.pageable = pageable;
+	}
+}

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

@@ -1,139 +1,140 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-import java.util.ArrayList;
-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.sort.SortBuilder;
-
-import java.util.Arrays;
-
-/**
- * NativeSearchQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Artur Konczak
- */
-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 List<AbstractAggregationBuilder> aggregations;
-	private HighlightBuilder.Field[] highlightFields;
-	private List<IndexBoost> indicesBoost;
-
-
-	public NativeSearchQuery(QueryBuilder query) {
-		this.query = query;
-	}
-
-	public NativeSearchQuery(QueryBuilder query, QueryBuilder filter) {
-		this.query = query;
-		this.filter = filter;
-	}
-
-	public NativeSearchQuery(QueryBuilder query, QueryBuilder filter, List<SortBuilder> sorts) {
-		this.query = query;
-		this.filter = filter;
-		this.sorts = sorts;
-	}
-
-	public NativeSearchQuery(QueryBuilder query, QueryBuilder filter, List<SortBuilder> sorts, HighlightBuilder.Field[] highlightFields) {
-		this.query = query;
-		this.filter = filter;
-		this.sorts = sorts;
-		this.highlightFields = highlightFields;
-	}
-
-	public QueryBuilder getQuery() {
-		return query;
-	}
-
-	public QueryBuilder getFilter() {
-		return filter;
-	}
-
-	public List<SortBuilder> getElasticsearchSorts() {
-		return sorts;
-	}
-
-	@Override
-	public HighlightBuilder.Field[] getHighlightFields() {
-		return highlightFields;
-	}
-
-    @Override
-    public List<ScriptField> getScriptFields() { return scriptFields; }
-
-    public void setScriptFields(List<ScriptField> scriptFields) {
-        this.scriptFields.addAll(scriptFields);
-    }
-
-    public void addScriptField(ScriptField... scriptField) {
-        scriptFields.addAll(Arrays.asList(scriptField));
-    }
-
-/*	public void addFacet(FacetRequest facetRequest) {
-		if (facets == null) {
-			facets = new ArrayList<FacetRequest>();
-		}
-		facets.add(facetRequest);
-	}
-
-	public void setFacets(List<FacetRequest> facets) {
-		this.facets = facets;
-	}
-
-	@Override
-	public List<FacetRequest> getFacets() {
-		return facets;
-	}*/
-
-	@Override
-	public List<AbstractAggregationBuilder> getAggregations() {
-		return aggregations;
-	}
-
-
-	public void addAggregation(AbstractAggregationBuilder aggregationBuilder) {
-		if (aggregations == null) {
-			aggregations = new ArrayList<AbstractAggregationBuilder>();
-		}
-		aggregations.add(aggregationBuilder);
-	}
-
-	public void setAggregations(List<AbstractAggregationBuilder> aggregations) {
-		this.aggregations = aggregations;
-	}
-
-	@Override
-	public List<IndexBoost> getIndicesBoost() {
-		return indicesBoost;
-	}
-
-	public void setIndicesBoost(List<IndexBoost> indicesBoost) {
-		this.indicesBoost = indicesBoost;
-	}
-
-}
+/*
+ * Copyright 2013-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+import java.util.ArrayList;
+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.sort.SortBuilder;
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
+
+import java.util.Arrays;
+
+/**
+ * NativeSearchQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ */
+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 List<AbstractAggregationBuilder> aggregations;
+	private HighlightBuilder.Field[] highlightFields;
+	private List<IndexBoost> indicesBoost;
+
+
+	public NativeSearchQuery(QueryBuilder query) {
+		this.query = query;
+	}
+
+	public NativeSearchQuery(QueryBuilder query, QueryBuilder filter) {
+		this.query = query;
+		this.filter = filter;
+	}
+
+	public NativeSearchQuery(QueryBuilder query, QueryBuilder filter, List<SortBuilder> sorts) {
+		this.query = query;
+		this.filter = filter;
+		this.sorts = sorts;
+	}
+
+	public NativeSearchQuery(QueryBuilder query, QueryBuilder filter, List<SortBuilder> sorts, HighlightBuilder.Field[] highlightFields) {
+		this.query = query;
+		this.filter = filter;
+		this.sorts = sorts;
+		this.highlightFields = highlightFields;
+	}
+
+	public QueryBuilder getQuery() {
+		return query;
+	}
+
+	public QueryBuilder getFilter() {
+		return filter;
+	}
+
+	public List<SortBuilder> getElasticsearchSorts() {
+		return sorts;
+	}
+
+	@Override
+	public HighlightBuilder.Field[] getHighlightFields() {
+		return highlightFields;
+	}
+
+    @Override
+    public List<ScriptField> getScriptFields() { return scriptFields; }
+
+    public void setScriptFields(List<ScriptField> scriptFields) {
+        this.scriptFields.addAll(scriptFields);
+    }
+
+    public void addScriptField(ScriptField... scriptField) {
+        scriptFields.addAll(Arrays.asList(scriptField));
+    }
+
+	public void addFacet(FacetRequest facetRequest) {
+		if (facets == null) {
+			facets = new ArrayList<FacetRequest>();
+		}
+		facets.add(facetRequest);
+	}
+
+	public void setFacets(List<FacetRequest> facets) {
+		this.facets = facets;
+	}
+
+	@Override
+	public List<FacetRequest> getFacets() {
+		return facets;
+	}
+
+	@Override
+	public List<AbstractAggregationBuilder> getAggregations() {
+		return aggregations;
+	}
+
+
+	public void addAggregation(AbstractAggregationBuilder aggregationBuilder) {
+		if (aggregations == null) {
+			aggregations = new ArrayList<AbstractAggregationBuilder>();
+		}
+		aggregations.add(aggregationBuilder);
+	}
+
+	public void setAggregations(List<AbstractAggregationBuilder> aggregations) {
+		this.aggregations = aggregations;
+	}
+
+	@Override
+	public List<IndexBoost> getIndicesBoost() {
+		return indicesBoost;
+	}
+
+	public void setIndicesBoost(List<IndexBoost> indicesBoost) {
+		this.indicesBoost = indicesBoost;
+	}
+
+}

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

@@ -1,193 +1,199 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-import static org.springframework.util.CollectionUtils.isEmpty;
-import java.util.ArrayList;
-import java.util.Collection;
-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.sort.SortBuilder;
-import org.springframework.data.domain.Pageable;
-
-/**
- * NativeSearchQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Artur Konczak
- */
-
-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 HighlightBuilder.Field[] highlightFields;
-	private Pageable pageable;
-	private String[] indices;
-	private String[] types;
-	private String[] fields;
-	private SourceFilter sourceFilter;
-	private List<IndexBoost> indicesBoost;
-	private float minScore;
-	private Collection<String> ids;
-	private String route;
-	private SearchType searchType;
-
-	public NativeSearchQueryBuilder withQuery(QueryBuilder queryBuilder) {
-		this.queryBuilder = queryBuilder;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withFilter(QueryBuilder filterBuilder) {
-		this.filterBuilder = filterBuilder;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withSort(SortBuilder sortBuilder) {
-		this.sortBuilders.add(sortBuilder);
-		return this;
-	}
-
-    public NativeSearchQueryBuilder withScriptField(ScriptField scriptField) {
-        this.scriptFields.add(scriptField);
-        return this;
-    }
-
-	public NativeSearchQueryBuilder addAggregation(AbstractAggregationBuilder aggregationBuilder) {
-		this.aggregationBuilders.add(aggregationBuilder);
-		return this;
-	}
-
-/*	public NativeSearchQueryBuilder withFacet(FacetRequest facetRequest) {
-		facetRequests.add(facetRequest);
-		return this;
-	}*/
-
-	public NativeSearchQueryBuilder withHighlightFields(HighlightBuilder.Field... highlightFields) {
-		this.highlightFields = highlightFields;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withIndicesBoost(List<IndexBoost> indicesBoost) {
-		this.indicesBoost = indicesBoost;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withPageable(Pageable pageable) {
-		this.pageable = pageable;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withIndices(String... indices) {
-		this.indices = indices;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withTypes(String... types) {
-		this.types = types;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withFields(String... fields) {
-		this.fields = fields;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withSourceFilter(SourceFilter sourceFilter) {
-				this.sourceFilter = sourceFilter;
-				return this;
-	}
-
-	public NativeSearchQueryBuilder withMinScore(float minScore) {
-		this.minScore = minScore;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withIds(Collection<String> ids) {
-		this.ids = ids;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withRoute(String route) {
-		this.route = route;
-		return this;
-	}
-
-	public NativeSearchQueryBuilder withSearchType(SearchType searchType) {
-		this.searchType = searchType;
-		return this;
-	}
-
-	public NativeSearchQuery build() {
-		NativeSearchQuery nativeSearchQuery = new NativeSearchQuery(queryBuilder, filterBuilder, sortBuilders, highlightFields);
-		if (pageable != null) {
-			nativeSearchQuery.setPageable(pageable);
-		}
-
-		if (indices != null) {
-			nativeSearchQuery.addIndices(indices);
-		}
-
-		if (types != null) {
-			nativeSearchQuery.addTypes(types);
-		}
-
-		if (fields != null) {
-			nativeSearchQuery.addFields(fields);
-		}
-
-		if (sourceFilter != null) {
-			nativeSearchQuery.addSourceFilter(sourceFilter);
-		}
-		
-		if(indicesBoost != null) {
-		    nativeSearchQuery.setIndicesBoost(indicesBoost);
-		}
-		
-        if (!isEmpty(scriptFields)) {
-            nativeSearchQuery.setScriptFields(scriptFields);
-        }
-
-		if (!isEmpty(aggregationBuilders)) {
-			nativeSearchQuery.setAggregations(aggregationBuilders);
-		}
-
-		if (minScore > 0) {
-			nativeSearchQuery.setMinScore(minScore);
-		}
-
-		if (ids != null) {
-			nativeSearchQuery.setIds(ids);
-		}
-
-		if (route != null) {
-			nativeSearchQuery.setRoute(route);
-		}
-
-		if (searchType != null) {
-			nativeSearchQuery.setSearchType(searchType);
-		}
-
-		return nativeSearchQuery;
-	}
-}
+/*
+ * Copyright 2013-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+import static org.springframework.util.CollectionUtils.isEmpty;
+import java.util.ArrayList;
+import java.util.Collection;
+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.sort.SortBuilder;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
+
+/**
+ * NativeSearchQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ */
+
+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<FacetRequest> facetRequests = new ArrayList<FacetRequest>();
+	private List<AbstractAggregationBuilder> aggregationBuilders = new ArrayList<AbstractAggregationBuilder>();
+	private HighlightBuilder.Field[] highlightFields;
+	private Pageable pageable;
+	private String[] indices;
+	private String[] types;
+	private String[] fields;
+	private SourceFilter sourceFilter;
+	private List<IndexBoost> indicesBoost;
+	private float minScore;
+	private Collection<String> ids;
+	private String route;
+	private SearchType searchType;
+
+	public NativeSearchQueryBuilder withQuery(QueryBuilder queryBuilder) {
+		this.queryBuilder = queryBuilder;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withFilter(QueryBuilder filterBuilder) {
+		this.filterBuilder = filterBuilder;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withSort(SortBuilder sortBuilder) {
+		this.sortBuilders.add(sortBuilder);
+		return this;
+	}
+
+    public NativeSearchQueryBuilder withScriptField(ScriptField scriptField) {
+        this.scriptFields.add(scriptField);
+        return this;
+    }
+
+	public NativeSearchQueryBuilder addAggregation(AbstractAggregationBuilder aggregationBuilder) {
+		this.aggregationBuilders.add(aggregationBuilder);
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withFacet(FacetRequest facetRequest) {
+		facetRequests.add(facetRequest);
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withHighlightFields(HighlightBuilder.Field... highlightFields) {
+		this.highlightFields = highlightFields;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withIndicesBoost(List<IndexBoost> indicesBoost) {
+		this.indicesBoost = indicesBoost;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withPageable(Pageable pageable) {
+		this.pageable = pageable;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withIndices(String... indices) {
+		this.indices = indices;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withTypes(String... types) {
+		this.types = types;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withFields(String... fields) {
+		this.fields = fields;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withSourceFilter(SourceFilter sourceFilter) {
+				this.sourceFilter = sourceFilter;
+				return this;
+	}
+
+	public NativeSearchQueryBuilder withMinScore(float minScore) {
+		this.minScore = minScore;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withIds(Collection<String> ids) {
+		this.ids = ids;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withRoute(String route) {
+		this.route = route;
+		return this;
+	}
+
+	public NativeSearchQueryBuilder withSearchType(SearchType searchType) {
+		this.searchType = searchType;
+		return this;
+	}
+
+	public NativeSearchQuery build() {
+		NativeSearchQuery nativeSearchQuery = new NativeSearchQuery(queryBuilder, filterBuilder, sortBuilders, highlightFields);
+		if (pageable != null) {
+			nativeSearchQuery.setPageable(pageable);
+		}
+
+		if (indices != null) {
+			nativeSearchQuery.addIndices(indices);
+		}
+
+		if (types != null) {
+			nativeSearchQuery.addTypes(types);
+		}
+
+		if (fields != null) {
+			nativeSearchQuery.addFields(fields);
+		}
+
+		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);
+		}
+
+		if (minScore > 0) {
+			nativeSearchQuery.setMinScore(minScore);
+		}
+
+		if (ids != null) {
+			nativeSearchQuery.setIds(ids);
+		}
+
+		if (route != null) {
+			nativeSearchQuery.setRoute(route);
+		}
+
+		if (searchType != null) {
+			nativeSearchQuery.setSearchType(searchType);
+		}
+
+		return nativeSearchQuery;
+	}
+}

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

@@ -1,157 +1,157 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-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;
-import org.springframework.data.domain.Sort;
-
-/**
- * Query
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public interface Query {
-
-	public static final int DEFAULT_PAGE_SIZE = 10;
-	public static final Pageable DEFAULT_PAGE = new PageRequest(0, DEFAULT_PAGE_SIZE);
-
-	/**
-	 * restrict result to entries on given page. Corresponds to the 'start' and 'rows' parameter in elasticsearch
-	 *
-	 * @param pageable
-	 * @return
-	 */
-	<T extends Query> T setPageable(Pageable pageable);
-
-	/**
-	 * Get filter queries if defined
-	 *
-	 * @return
-	 */
-	// List<FilterQuery> getFilterQueries();
-
-	/**
-	 * Get page settings if defined
-	 *
-	 * @return
-	 */
-	Pageable getPageable();
-
-	/**
-	 * Add {@link org.springframework.data.domain.Sort} to query
-	 *
-	 * @param sort
-	 * @return
-	 */
-	<T extends Query> T addSort(Sort sort);
-
-	/**
-	 * @return null if not set
-	 */
-	Sort getSort();
-
-	/**
-	 * Get Indices to be searched
-	 *
-	 * @return
-	 */
-	List<String> getIndices();
-
-	/**
-	 * Add Indices to be added as part of search request
-	 *
-	 * @param indices
-	 */
-	void addIndices(String... indices);
-
-	/**
-	 * Add types to be searched
-	 *
-	 * @param types
-	 */
-	void addTypes(String... types);
-
-	/**
-	 * Get types to be searched
-	 *
-	 * @return
-	 */
-	List<String> getTypes();
-
-	/**
-	 * Add fields to be added as part of search request
-	 *
-	 * @param fields
-	 */
-	void addFields(String... fields);
-
-	/**
-	 * Get fields to be returned as part of search request
-	 *
-	 * @return
-	 */
-	List<String> getFields();
-
-	/**
-	 * Add source filter to be added as part of search request
-	 *
-	 * @param sourceFilter
-	 */
-	void addSourceFilter(SourceFilter sourceFilter);
-
-	/**
-	 * Get SourceFilter to be returned to get include and exclude source
-	 * fields as part of search request.
-	 *
-	 * @return SourceFilter
-	 */
-	SourceFilter getSourceFilter();
-
-	/**
-	 * Get minimum score
-	 *
-	 * @return
-	 */
-	float getMinScore();
-
-	/**
-	 * Get Ids
-	 *
-	 * @return
-	 */
-	Collection<String> getIds();
-
-	/**
-	 * Get route
-	 *
-	 * @return
-	 */
-	String getRoute();
-
-
-	/**
-	 * Type of search
-	 *
-	 * @return
-	 */
-	SearchType getSearchType();
-}
+/*
+ * Copyright 2013-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+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;
+import org.springframework.data.domain.Sort;
+
+/**
+ * Query
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public interface Query {
+
+	public static final int DEFAULT_PAGE_SIZE = 10;
+	public static final Pageable DEFAULT_PAGE = new PageRequest(0, DEFAULT_PAGE_SIZE);
+
+	/**
+	 * restrict result to entries on given page. Corresponds to the 'start' and 'rows' parameter in elasticsearch
+	 *
+	 * @param pageable
+	 * @return
+	 */
+	<T extends Query> T setPageable(Pageable pageable);
+
+	/**
+	 * Get filter queries if defined
+	 *
+	 * @return
+	 */
+	// List<FilterQuery> getFilterQueries();
+
+	/**
+	 * Get page settings if defined
+	 *
+	 * @return
+	 */
+	Pageable getPageable();
+
+	/**
+	 * Add {@link org.springframework.data.domain.Sort} to query
+	 *
+	 * @param sort
+	 * @return
+	 */
+	<T extends Query> T addSort(Sort sort);
+
+	/**
+	 * @return null if not set
+	 */
+	Sort getSort();
+
+	/**
+	 * Get Indices to be searched
+	 *
+	 * @return
+	 */
+	List<String> getIndices();
+
+	/**
+	 * Add Indices to be added as part of search request
+	 *
+	 * @param indices
+	 */
+	void addIndices(String... indices);
+
+	/**
+	 * Add types to be searched
+	 *
+	 * @param types
+	 */
+	void addTypes(String... types);
+
+	/**
+	 * Get types to be searched
+	 *
+	 * @return
+	 */
+	List<String> getTypes();
+
+	/**
+	 * Add fields to be added as part of search request
+	 *
+	 * @param fields
+	 */
+	void addFields(String... fields);
+
+	/**
+	 * Get fields to be returned as part of search request
+	 *
+	 * @return
+	 */
+	List<String> getFields();
+
+	/**
+	 * Add source filter to be added as part of search request
+	 *
+	 * @param sourceFilter
+	 */
+	void addSourceFilter(SourceFilter sourceFilter);
+
+	/**
+	 * Get SourceFilter to be returned to get include and exclude source
+	 * fields as part of search request.
+	 *
+	 * @return SourceFilter
+	 */
+	SourceFilter getSourceFilter();
+
+	/**
+	 * Get minimum score
+	 *
+	 * @return
+	 */
+	float getMinScore();
+
+	/**
+	 * Get Ids
+	 *
+	 * @return
+	 */
+	Collection<String> getIds();
+
+	/**
+	 * Get route
+	 *
+	 * @return
+	 */
+	String getRoute();
+
+
+	/**
+	 * Type of search
+	 *
+	 * @return
+	 */
+	SearchType getSearchType();
+}

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

@@ -1,50 +1,52 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.core.query;
-
-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.sort.SortBuilder;
-
-/**
- * NativeSearchQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Artur Konczak
- */
-public interface SearchQuery extends Query {
-
-	QueryBuilder getQuery();
-
-	QueryBuilder getFilter();
-
-	List<SortBuilder> getElasticsearchSorts();
-
-	/*List<FacetRequest> getFacets();*/
-
-	List<AbstractAggregationBuilder> getAggregations();
-
-	HighlightBuilder.Field[] getHighlightFields();
-
-	List<IndexBoost> getIndicesBoost();
-
-    List<ScriptField> getScriptFields();
-
-}
+/*
+ * Copyright 2013-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.core.query;
+
+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.sort.SortBuilder;
+import org.springframework.data.elasticsearch.core.facet.FacetRequest;
+
+/**
+ * NativeSearchQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ */
+public interface SearchQuery extends Query {
+
+	QueryBuilder getQuery();
+
+	QueryBuilder getFilter();
+
+	List<SortBuilder> getElasticsearchSorts();
+
+	@Deprecated
+	List<FacetRequest> getFacets();
+
+	List<AbstractAggregationBuilder> getAggregations();
+
+	HighlightBuilder.Field[] getHighlightFields();
+
+	List<IndexBoost> getIndicesBoost();
+
+    List<ScriptField> getScriptFields();
+
+}

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

@@ -1,41 +1,41 @@
-/*
- * 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.core.query;
-
-/**
- * The most trivial implementation of a Field
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public class SimpleField implements Field {
-
-	private final String name;
-
-	public SimpleField(String name) {
-		this.name = name;
-	}
-
-	@Override
-	public String getName() {
-		return this.name;
-	}
-
-	@Override
-	public String toString() {
-		return this.name;
-	}
+/*
+ * 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.core.query;
+
+/**
+ * The most trivial implementation of a Field
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class SimpleField implements Field {
+
+	private final String name;
+
+	public SimpleField(String name) {
+		this.name = name;
+	}
+
+	@Override
+	public String getName() {
+		return this.name;
+	}
+
+	@Override
+	public String toString() {
+		return this.name;
+	}
 }

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

@@ -1,49 +1,49 @@
-/*
- * 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.core.query;
-
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.domain.Sort;
-
-/**
- * StringQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public class StringQuery extends AbstractQuery {
-
-	private String source;
-
-	public StringQuery(String source) {
-		this.source = source;
-	}
-
-	public StringQuery(String source, Pageable pageable) {
-		this.source = source;
-		this.pageable = pageable;
-	}
-
-	public StringQuery(String source, Pageable pageable, Sort sort) {
-		this.pageable = pageable;
-		this.sort = sort;
-		this.source = source;
-	}
-
-	public String getSource() {
-		return source;
-	}
-}
+/*
+ * 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.core.query;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+
+/**
+ * StringQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class StringQuery extends AbstractQuery {
+
+	private String source;
+
+	public StringQuery(String source) {
+		this.source = source;
+	}
+
+	public StringQuery(String source, Pageable pageable) {
+		this.source = source;
+		this.pageable = pageable;
+	}
+
+	public StringQuery(String source, Pageable pageable, Sort sort) {
+		this.pageable = pageable;
+		this.sort = sort;
+		this.source = source;
+	}
+
+	public String getSource() {
+		return source;
+	}
+}

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

@@ -1,33 +1,33 @@
-/*
- * 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.repository;
-
-import java.io.Serializable;
-
-import org.springframework.data.repository.NoRepositoryBean;
-import org.springframework.data.repository.PagingAndSortingRepository;
-
-/**
- * @param <T>
- * @param <ID>
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Oliver Gierke
- */
-@NoRepositoryBean
-public interface ElasticsearchCrudRepository<T, ID extends Serializable> extends PagingAndSortingRepository<T, ID> {
-
-}
+/*
+ * 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.repository;
+
+import java.io.Serializable;
+
+import org.springframework.data.repository.NoRepositoryBean;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+/**
+ * @param <T>
+ * @param <ID>
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Oliver Gierke
+ */
+@NoRepositoryBean
+public interface ElasticsearchCrudRepository<T, ID extends Serializable> extends PagingAndSortingRepository<T, ID> {
+
+}

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

@@ -1,46 +1,48 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.repository;
-
-import java.io.Serializable;
-
-import org.elasticsearch.index.query.QueryBuilder;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.elasticsearch.core.query.SearchQuery;
-import org.springframework.data.repository.NoRepositoryBean;
-
-/**
- * @param <T>
- * @param <ID>
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-@NoRepositoryBean
-public interface ElasticsearchRepository<T, ID extends Serializable> extends ElasticsearchCrudRepository<T, ID> {
-
-	<S extends T> S index(S entity);
-
-	Iterable<T> search(QueryBuilder query);
-
-	Page<T> search(QueryBuilder query, Pageable pageable);
-
-	Page<T> search(SearchQuery searchQuery);
-
-	Page<T> searchSimilar(T entity, String[] fields, Pageable pageable);
-
-	void refresh();
-}
+/*
+ * Copyright 2013-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository;
+
+import java.io.Serializable;
+
+import org.elasticsearch.index.query.QueryBuilder;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.elasticsearch.core.query.SearchQuery;
+import org.springframework.data.repository.NoRepositoryBean;
+
+/**
+ * @param <T>
+ * @param <ID>
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+@NoRepositoryBean
+public interface ElasticsearchRepository<T, ID extends Serializable> extends ElasticsearchCrudRepository<T, ID> {
+
+	<S extends T> S index(S entity);
+
+	Iterable<T> search(QueryBuilder query);
+
+	Page<T> search(QueryBuilder query, Pageable pageable);
+
+	Page<T> search(SearchQuery searchQuery);
+
+	Page<T> searchSimilar(T entity, String[] fields, Pageable pageable);
+
+	void refresh();
+
+	Class<T> getEntityClass();
+}

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

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

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

@@ -1,82 +1,82 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.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;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
-import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
-import org.springframework.data.repository.cdi.CdiRepositoryBean;
-import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport;
-
-/**
- * CDI extension to export Elasticsearch repositories.
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Oliver Gierke
- * @author Mark Paluch
- */
-public class ElasticsearchRepositoryExtension extends CdiRepositoryExtensionSupport {
-
-	private final Map<Set<Annotation>, Bean<ElasticsearchOperations>> elasticsearchOperationsMap = new HashMap<Set<Annotation>, Bean<ElasticsearchOperations>>();
-
-	@SuppressWarnings("unchecked")
-	<T> void processBean(@Observes ProcessBean<T> processBean) {
-		Bean<T> bean = processBean.getBean();
-		for (Type type : bean.getTypes()) {
-			if (type instanceof Class<?> && ElasticsearchOperations.class.isAssignableFrom((Class<?>) type)) {
-				elasticsearchOperationsMap.put(bean.getQualifiers(), ((Bean<ElasticsearchOperations>) bean));
-			}
-		}
-	}
-
-	void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager beanManager) {
-		for (Entry<Class<?>, Set<Annotation>> entry : getRepositoryTypes()) {
-
-			Class<?> repositoryType = entry.getKey();
-			Set<Annotation> qualifiers = entry.getValue();
-
-			CdiRepositoryBean<?> repositoryBean = createRepositoryBean(repositoryType, qualifiers, beanManager);
-			afterBeanDiscovery.addBean(repositoryBean);
-			registerBean(repositoryBean);
-		}
-	}
-
-	private <T> CdiRepositoryBean<T> createRepositoryBean(Class<T> repositoryType, Set<Annotation> qualifiers,
-														  BeanManager beanManager) {
-
-		Bean<ElasticsearchOperations> elasticsearchOperationsBean = this.elasticsearchOperationsMap.get(qualifiers);
-
-		if (elasticsearchOperationsBean == null) {
-			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,
-				getCustomImplementationDetector());
-	}
-}
+/*
+ * Copyright 2013-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.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;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.repository.cdi.CdiRepositoryBean;
+import org.springframework.data.repository.cdi.CdiRepositoryExtensionSupport;
+
+/**
+ * CDI extension to export Elasticsearch repositories.
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Oliver Gierke
+ * @author Mark Paluch
+ */
+public class ElasticsearchRepositoryExtension extends CdiRepositoryExtensionSupport {
+
+	private final Map<Set<Annotation>, Bean<ElasticsearchOperations>> elasticsearchOperationsMap = new HashMap<Set<Annotation>, Bean<ElasticsearchOperations>>();
+
+	@SuppressWarnings("unchecked")
+	<T> void processBean(@Observes ProcessBean<T> processBean) {
+		Bean<T> bean = processBean.getBean();
+		for (Type type : bean.getTypes()) {
+			if (type instanceof Class<?> && ElasticsearchOperations.class.isAssignableFrom((Class<?>) type)) {
+				elasticsearchOperationsMap.put(bean.getQualifiers(), ((Bean<ElasticsearchOperations>) bean));
+			}
+		}
+	}
+
+	void afterBeanDiscovery(@Observes AfterBeanDiscovery afterBeanDiscovery, BeanManager beanManager) {
+		for (Entry<Class<?>, Set<Annotation>> entry : getRepositoryTypes()) {
+
+			Class<?> repositoryType = entry.getKey();
+			Set<Annotation> qualifiers = entry.getValue();
+
+			CdiRepositoryBean<?> repositoryBean = createRepositoryBean(repositoryType, qualifiers, beanManager);
+			afterBeanDiscovery.addBean(repositoryBean);
+			registerBean(repositoryBean);
+		}
+	}
+
+	private <T> CdiRepositoryBean<T> createRepositoryBean(Class<T> repositoryType, Set<Annotation> qualifiers,
+														  BeanManager beanManager) {
+
+		Bean<ElasticsearchOperations> elasticsearchOperationsBean = this.elasticsearchOperationsMap.get(qualifiers);
+
+		if (elasticsearchOperationsBean == null) {
+			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,
+				getCustomImplementationDetector());
+	}
+}

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

@@ -1,44 +1,44 @@
-/*
- * 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.query;
-
-import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.RepositoryQuery;
-
-/**
- * AbstractElasticsearchRepositoryQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-public abstract class AbstractElasticsearchRepositoryQuery implements RepositoryQuery {
-
-	protected ElasticsearchQueryMethod queryMethod;
-	protected ElasticsearchOperations elasticsearchOperations;
-
-	public AbstractElasticsearchRepositoryQuery(ElasticsearchQueryMethod queryMethod,
-												ElasticsearchOperations elasticsearchOperations) {
-		this.queryMethod = queryMethod;
-		this.elasticsearchOperations = elasticsearchOperations;
-	}
-
-	@Override
-	public QueryMethod getQueryMethod() {
-		return queryMethod;
-	}
-}
+/*
+ * 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.query;
+
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.repository.query.QueryMethod;
+import org.springframework.data.repository.query.RepositoryQuery;
+
+/**
+ * AbstractElasticsearchRepositoryQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+public abstract class AbstractElasticsearchRepositoryQuery implements RepositoryQuery {
+
+	protected ElasticsearchQueryMethod queryMethod;
+	protected ElasticsearchOperations elasticsearchOperations;
+
+	public AbstractElasticsearchRepositoryQuery(ElasticsearchQueryMethod queryMethod,
+												ElasticsearchOperations elasticsearchOperations) {
+		this.queryMethod = queryMethod;
+		this.elasticsearchOperations = elasticsearchOperations;
+	}
+
+	@Override
+	public QueryMethod getQueryMethod() {
+		return queryMethod;
+	}
+}

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

@@ -1,104 +1,104 @@
-/*
- * 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.query;
-
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
-import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
-import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
-import org.springframework.data.elasticsearch.repository.query.parser.ElasticsearchQueryCreator;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.data.repository.query.parser.PartTree;
-import org.springframework.util.ClassUtils;
-import org.springframework.data.util.CloseableIterator;
-import org.springframework.data.util.StreamUtils;
-
-/**
- * ElasticsearchPartQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Kevin Leturc
- */
-public class ElasticsearchPartQuery extends AbstractElasticsearchRepositoryQuery {
-
-	private final PartTree tree;
-	private final MappingContext<?, ElasticsearchPersistentProperty> mappingContext;
-
-	public ElasticsearchPartQuery(ElasticsearchQueryMethod method, ElasticsearchOperations elasticsearchOperations) {
-		super(method, elasticsearchOperations);
-		this.tree = new PartTree(method.getName(), method.getEntityInformation().getJavaType());
-		this.mappingContext = elasticsearchOperations.getElasticsearchConverter().getMappingContext();
-	}
-
-	@Override
-	public Object execute(Object[] parameters) {
-		ParametersParameterAccessor accessor = new ParametersParameterAccessor(queryMethod.getParameters(), parameters);
-		CriteriaQuery query = createQuery(accessor);
-		if(tree.isDelete()) {
-			Object result = countOrGetDocumentsForDelete(query, accessor);
-			elasticsearchOperations.delete(query, queryMethod.getEntityInformation().getJavaType());
-			return result;
-		} else if (queryMethod.isPageQuery()) {
-			query.setPageable(accessor.getPageable());
-			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));
-			}
-
-			return StreamUtils.createStreamFromIterator((CloseableIterator<Object>) elasticsearchOperations.stream(query, entityType));
-
-		} else if (queryMethod.isCollectionQuery()) {
-			if (accessor.getPageable() == null) {
-				int itemCount = (int) elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType());
-				query.setPageable(new PageRequest(0, Math.max(1, itemCount)));
-			} else {
-			    query.setPageable(accessor.getPageable());
-		    }
-			return elasticsearchOperations.queryForList(query, queryMethod.getEntityInformation().getJavaType());
-		} else if (tree.isCountProjection()) {
-			return elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType());
-		}
-		return elasticsearchOperations.queryForObject(query, queryMethod.getEntityInformation().getJavaType());
-	}
-
-	private Object countOrGetDocumentsForDelete(CriteriaQuery query, ParametersParameterAccessor accessor) {
-
-		Object result = null;
-
-		if (queryMethod.isCollectionQuery()) {
-			if (accessor.getPageable() == null) {
-				int itemCount = (int) elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType());
-				query.setPageable(new PageRequest(0, Math.max(1, itemCount)));
-			} else {
-				query.setPageable(accessor.getPageable());
-			}
-			result = elasticsearchOperations.queryForList(query, queryMethod.getEntityInformation().getJavaType());
-		}
-
-		if (ClassUtils.isAssignable(Number.class, queryMethod.getReturnedObjectType())) {
-			result = elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType());
-		}
-		return result;
-	}
-
-	public CriteriaQuery createQuery(ParametersParameterAccessor accessor) {
-		return new ElasticsearchQueryCreator(tree, accessor, mappingContext).createQuery();
-	}
-}
+/*
+ * 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.query;
+
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
+import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
+import org.springframework.data.elasticsearch.repository.query.parser.ElasticsearchQueryCreator;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.repository.query.ParametersParameterAccessor;
+import org.springframework.data.repository.query.parser.PartTree;
+import org.springframework.util.ClassUtils;
+import org.springframework.data.util.CloseableIterator;
+import org.springframework.data.util.StreamUtils;
+
+/**
+ * ElasticsearchPartQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Kevin Leturc
+ */
+public class ElasticsearchPartQuery extends AbstractElasticsearchRepositoryQuery {
+
+	private final PartTree tree;
+	private final MappingContext<?, ElasticsearchPersistentProperty> mappingContext;
+
+	public ElasticsearchPartQuery(ElasticsearchQueryMethod method, ElasticsearchOperations elasticsearchOperations) {
+		super(method, elasticsearchOperations);
+		this.tree = new PartTree(method.getName(), method.getEntityInformation().getJavaType());
+		this.mappingContext = elasticsearchOperations.getElasticsearchConverter().getMappingContext();
+	}
+
+	@Override
+	public Object execute(Object[] parameters) {
+		ParametersParameterAccessor accessor = new ParametersParameterAccessor(queryMethod.getParameters(), parameters);
+		CriteriaQuery query = createQuery(accessor);
+		if(tree.isDelete()) {
+			Object result = countOrGetDocumentsForDelete(query, accessor);
+			elasticsearchOperations.delete(query, queryMethod.getEntityInformation().getJavaType());
+			return result;
+		} else if (queryMethod.isPageQuery()) {
+			query.setPageable(accessor.getPageable());
+			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));
+			}
+
+			return StreamUtils.createStreamFromIterator((CloseableIterator<Object>) elasticsearchOperations.stream(query, entityType));
+
+		} else if (queryMethod.isCollectionQuery()) {
+			if (accessor.getPageable() == null) {
+				int itemCount = (int) elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType());
+				query.setPageable(new PageRequest(0, Math.max(1, itemCount)));
+			} else {
+			    query.setPageable(accessor.getPageable());
+		    }
+			return elasticsearchOperations.queryForList(query, queryMethod.getEntityInformation().getJavaType());
+		} else if (tree.isCountProjection()) {
+			return elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType());
+		}
+		return elasticsearchOperations.queryForObject(query, queryMethod.getEntityInformation().getJavaType());
+	}
+
+	private Object countOrGetDocumentsForDelete(CriteriaQuery query, ParametersParameterAccessor accessor) {
+
+		Object result = null;
+
+		if (queryMethod.isCollectionQuery()) {
+			if (accessor.getPageable() == null) {
+				int itemCount = (int) elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType());
+				query.setPageable(new PageRequest(0, Math.max(1, itemCount)));
+			} else {
+				query.setPageable(accessor.getPageable());
+			}
+			result = elasticsearchOperations.queryForList(query, queryMethod.getEntityInformation().getJavaType());
+		}
+
+		if (ClassUtils.isAssignable(Number.class, queryMethod.getReturnedObjectType())) {
+			result = elasticsearchOperations.count(query, queryMethod.getEntityInformation().getJavaType());
+		}
+		return result;
+	}
+
+	public CriteriaQuery createQuery(ParametersParameterAccessor accessor) {
+		return new ElasticsearchQueryCreator(tree, accessor, mappingContext).createQuery();
+	}
+}

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

@@ -1,51 +1,51 @@
-/*
- * 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.query;
-
-import java.lang.reflect.Method;
-
-import org.springframework.core.annotation.AnnotationUtils;
-import org.springframework.data.elasticsearch.annotations.Query;
-import org.springframework.data.projection.ProjectionFactory;
-import org.springframework.data.repository.core.RepositoryMetadata;
-import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.util.StringUtils;
-
-/**
- * ElasticsearchQueryMethod
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Oliver Gierke
- */
-public class ElasticsearchQueryMethod extends QueryMethod {
-
-	private final Query queryAnnotation;
-
-	public ElasticsearchQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFactory factory) {
-		super(method, metadata, factory);
-		this.queryAnnotation = method.getAnnotation(Query.class);
-	}
-
-	public boolean hasAnnotatedQuery() {
-		return this.queryAnnotation != null;
-	}
-
-	public String getAnnotatedQuery() {
-		String query = (String) AnnotationUtils.getValue(queryAnnotation, "value");
-		return StringUtils.hasText(query) ? query : null;
-	}
-}
+/*
+ * 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.query;
+
+import java.lang.reflect.Method;
+
+import org.springframework.core.annotation.AnnotationUtils;
+import org.springframework.data.elasticsearch.annotations.Query;
+import org.springframework.data.projection.ProjectionFactory;
+import org.springframework.data.repository.core.RepositoryMetadata;
+import org.springframework.data.repository.query.QueryMethod;
+import org.springframework.util.StringUtils;
+
+/**
+ * ElasticsearchQueryMethod
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Oliver Gierke
+ */
+public class ElasticsearchQueryMethod extends QueryMethod {
+
+	private final Query queryAnnotation;
+
+	public ElasticsearchQueryMethod(Method method, RepositoryMetadata metadata, ProjectionFactory factory) {
+		super(method, metadata, factory);
+		this.queryAnnotation = method.getAnnotation(Query.class);
+	}
+
+	public boolean hasAnnotatedQuery() {
+		return this.queryAnnotation != null;
+	}
+
+	public String getAnnotatedQuery() {
+		String query = (String) AnnotationUtils.getValue(queryAnnotation, "value");
+		return StringUtils.hasText(query) ? query : null;
+	}
+}

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

@@ -1,103 +1,103 @@
-/*
- * 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.query;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.springframework.core.convert.support.GenericConversionService;
-import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
-import org.springframework.data.elasticsearch.core.convert.DateTimeConverters;
-import org.springframework.data.elasticsearch.core.query.StringQuery;
-import org.springframework.data.repository.query.ParametersParameterAccessor;
-import org.springframework.util.Assert;
-
-/**
- * ElasticsearchStringQuery
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public class ElasticsearchStringQuery extends AbstractElasticsearchRepositoryQuery {
-
-	private static final Pattern PARAMETER_PLACEHOLDER = Pattern.compile("\\?(\\d+)");
-	private String query;
-
-	private final GenericConversionService conversionService = new GenericConversionService();
-
-	{
-		if (!conversionService.canConvert(java.util.Date.class, String.class)) {
-			conversionService.addConverter(DateTimeConverters.JavaDateConverter.INSTANCE);
-		}
-		if (!conversionService.canConvert(org.joda.time.ReadableInstant.class, String.class)) {
-			conversionService.addConverter(DateTimeConverters.JodaDateTimeConverter.INSTANCE);
-		}
-		if (!conversionService.canConvert(org.joda.time.LocalDateTime.class, String.class)) {
-			conversionService.addConverter(DateTimeConverters.JodaLocalDateTimeConverter.INSTANCE);
-		}
-	}
-
-	public ElasticsearchStringQuery(ElasticsearchQueryMethod queryMethod,
-									ElasticsearchOperations elasticsearchOperations, String query) {
-		super(queryMethod, elasticsearchOperations);
-		Assert.notNull(query, "Query cannot be empty");
-		this.query = query;
-	}
-
-	@Override
-	public Object execute(Object[] parameters) {
-		ParametersParameterAccessor accessor = new ParametersParameterAccessor(queryMethod.getParameters(), parameters);
-		StringQuery stringQuery = createQuery(accessor);
-		if (queryMethod.isPageQuery()) {
-			stringQuery.setPageable(accessor.getPageable());
-			return elasticsearchOperations.queryForPage(stringQuery, queryMethod.getEntityInformation().getJavaType());
-		} else if (queryMethod.isCollectionQuery()) {
-			if (accessor.getPageable() != null) {
-				stringQuery.setPageable(accessor.getPageable());
-			}
-			return elasticsearchOperations.queryForList(stringQuery, queryMethod.getEntityInformation().getJavaType());
-		}
-
-		return elasticsearchOperations.queryForObject(stringQuery, queryMethod.getEntityInformation().getJavaType());
-	}
-
-	protected StringQuery createQuery(ParametersParameterAccessor parameterAccessor) {
-		String queryString = replacePlaceholders(this.query, parameterAccessor);
-		return new StringQuery(queryString);
-	}
-
-	private String replacePlaceholders(String input, ParametersParameterAccessor accessor) {
-		Matcher matcher = PARAMETER_PLACEHOLDER.matcher(input);
-		String result = input;
-		while (matcher.find()) {
-			String group = matcher.group();
-			int index = Integer.parseInt(matcher.group(1));
-			result = result.replace(group, getParameterWithIndex(accessor, index));
-		}
-		return result;
-	}
-
-	private String getParameterWithIndex(ParametersParameterAccessor accessor, int index) {
-		Object parameter = accessor.getBindableValue(index);
-		if (parameter == null) {
-			return "null";
-		}
-		if (conversionService.canConvert(parameter.getClass(), String.class)) {
-			return conversionService.convert(parameter, String.class);
-		}
-		return parameter.toString();
-	}
-}
+/*
+ * 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.query;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.convert.DateTimeConverters;
+import org.springframework.data.elasticsearch.core.query.StringQuery;
+import org.springframework.data.repository.query.ParametersParameterAccessor;
+import org.springframework.util.Assert;
+
+/**
+ * ElasticsearchStringQuery
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class ElasticsearchStringQuery extends AbstractElasticsearchRepositoryQuery {
+
+	private static final Pattern PARAMETER_PLACEHOLDER = Pattern.compile("\\?(\\d+)");
+	private String query;
+
+	private final GenericConversionService conversionService = new GenericConversionService();
+
+	{
+		if (!conversionService.canConvert(java.util.Date.class, String.class)) {
+			conversionService.addConverter(DateTimeConverters.JavaDateConverter.INSTANCE);
+		}
+		if (!conversionService.canConvert(org.joda.time.ReadableInstant.class, String.class)) {
+			conversionService.addConverter(DateTimeConverters.JodaDateTimeConverter.INSTANCE);
+		}
+		if (!conversionService.canConvert(org.joda.time.LocalDateTime.class, String.class)) {
+			conversionService.addConverter(DateTimeConverters.JodaLocalDateTimeConverter.INSTANCE);
+		}
+	}
+
+	public ElasticsearchStringQuery(ElasticsearchQueryMethod queryMethod,
+									ElasticsearchOperations elasticsearchOperations, String query) {
+		super(queryMethod, elasticsearchOperations);
+		Assert.notNull(query, "Query cannot be empty");
+		this.query = query;
+	}
+
+	@Override
+	public Object execute(Object[] parameters) {
+		ParametersParameterAccessor accessor = new ParametersParameterAccessor(queryMethod.getParameters(), parameters);
+		StringQuery stringQuery = createQuery(accessor);
+		if (queryMethod.isPageQuery()) {
+			stringQuery.setPageable(accessor.getPageable());
+			return elasticsearchOperations.queryForPage(stringQuery, queryMethod.getEntityInformation().getJavaType());
+		} else if (queryMethod.isCollectionQuery()) {
+			if (accessor.getPageable() != null) {
+				stringQuery.setPageable(accessor.getPageable());
+			}
+			return elasticsearchOperations.queryForList(stringQuery, queryMethod.getEntityInformation().getJavaType());
+		}
+
+		return elasticsearchOperations.queryForObject(stringQuery, queryMethod.getEntityInformation().getJavaType());
+	}
+
+	protected StringQuery createQuery(ParametersParameterAccessor parameterAccessor) {
+		String queryString = replacePlaceholders(this.query, parameterAccessor);
+		return new StringQuery(queryString);
+	}
+
+	private String replacePlaceholders(String input, ParametersParameterAccessor accessor) {
+		Matcher matcher = PARAMETER_PLACEHOLDER.matcher(input);
+		String result = input;
+		while (matcher.find()) {
+			String group = matcher.group();
+			int index = Integer.parseInt(matcher.group(1));
+			result = result.replace(group, getParameterWithIndex(accessor, index));
+		}
+		return result;
+	}
+
+	private String getParameterWithIndex(ParametersParameterAccessor accessor, int index) {
+		Object parameter = accessor.getBindableValue(index);
+		if (parameter == null) {
+			return "null";
+		}
+		if (conversionService.canConvert(parameter.getClass(), String.class)) {
+			return conversionService.convert(parameter, String.class);
+		}
+		return parameter.toString();
+	}
+}

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

@@ -1,195 +1,195 @@
-/*
- * 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.query.parser;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.springframework.dao.InvalidDataAccessApiUsageException;
-import org.springframework.data.domain.Sort;
-import org.springframework.data.elasticsearch.core.geo.GeoBox;
-import org.springframework.data.elasticsearch.core.geo.GeoPoint;
-import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
-import org.springframework.data.elasticsearch.core.query.Criteria;
-import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
-import org.springframework.data.geo.Box;
-import org.springframework.data.geo.Distance;
-import org.springframework.data.geo.Point;
-import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.data.mapping.context.PersistentPropertyPath;
-import org.springframework.data.repository.query.ParameterAccessor;
-import org.springframework.data.repository.query.parser.AbstractQueryCreator;
-import org.springframework.data.repository.query.parser.Part;
-import org.springframework.data.repository.query.parser.PartTree;
-
-/**
- * ElasticsearchQueryCreator
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Franck Marchand
- * @author Artur Konczak
- */
-public class ElasticsearchQueryCreator extends AbstractQueryCreator<CriteriaQuery, CriteriaQuery> {
-
-	private final MappingContext<?, ElasticsearchPersistentProperty> context;
-
-	public ElasticsearchQueryCreator(PartTree tree, ParameterAccessor parameters,
-									 MappingContext<?, ElasticsearchPersistentProperty> context) {
-		super(tree, parameters);
-		this.context = context;
-	}
-
-	public ElasticsearchQueryCreator(PartTree tree, MappingContext<?, ElasticsearchPersistentProperty> context) {
-		super(tree);
-		this.context = context;
-	}
-
-	@Override
-	protected CriteriaQuery create(Part part, Iterator<Object> iterator) {
-		PersistentPropertyPath<ElasticsearchPersistentProperty> path = context
-				.getPersistentPropertyPath(part.getProperty());
-		return new CriteriaQuery(from(part,
-				new Criteria(path.toDotPath(ElasticsearchPersistentProperty.PropertyToFieldNameConverter.INSTANCE)), iterator));
-	}
-
-	@Override
-	protected CriteriaQuery and(Part part, CriteriaQuery base, Iterator<Object> iterator) {
-		if (base == null) {
-			return create(part, iterator);
-		}
-		PersistentPropertyPath<ElasticsearchPersistentProperty> path = context
-				.getPersistentPropertyPath(part.getProperty());
-		return base.addCriteria(from(part,
-				new Criteria(path.toDotPath(ElasticsearchPersistentProperty.PropertyToFieldNameConverter.INSTANCE)), iterator));
-	}
-
-	@Override
-	protected CriteriaQuery or(CriteriaQuery base, CriteriaQuery query) {
-		return new CriteriaQuery(base.getCriteria().or(query.getCriteria()));
-	}
-
-	@Override
-	protected CriteriaQuery complete(CriteriaQuery query, Sort sort) {
-		if (query == null) {
-			return null;
-		}
-		return query.addSort(sort);
-	}
-
-	private Criteria from(Part part, Criteria instance, Iterator<?> parameters) {
-		Part.Type type = part.getType();
-
-		Criteria criteria = instance;
-		if (criteria == null) {
-			criteria = new Criteria();
-		}
-		switch (type) {
-			case TRUE:
-				return criteria.is(true);
-			case FALSE:
-				return criteria.is(false);
-			case NEGATING_SIMPLE_PROPERTY:
-				return criteria.is(parameters.next()).not();
-			case REGEX:
-				return criteria.expression(parameters.next().toString());
-			case LIKE:
-			case STARTING_WITH:
-				return criteria.startsWith(parameters.next().toString());
-			case ENDING_WITH:
-				return criteria.endsWith(parameters.next().toString());
-			case CONTAINING:
-				return criteria.contains(parameters.next().toString());
-			case GREATER_THAN:
-				return criteria.greaterThan(parameters.next());
-			case AFTER:
-			case GREATER_THAN_EQUAL:
-				return criteria.greaterThanEqual(parameters.next());
-			case LESS_THAN:
-				return criteria.lessThan(parameters.next());
-			case BEFORE:
-			case LESS_THAN_EQUAL:
-				return criteria.lessThanEqual(parameters.next());
-			case BETWEEN:
-				return criteria.between(parameters.next(), parameters.next());
-			case IN:
-				return criteria.in(asArray(parameters.next()));
-			case NOT_IN:
-				return criteria.notIn(asArray(parameters.next()));
-			case SIMPLE_PROPERTY:
-			case WITHIN: {
-				Object firstParameter = parameters.next();
-				Object secondParameter = null;
-				if (type == Part.Type.SIMPLE_PROPERTY) {
-					if (part.getProperty().getType() != GeoPoint.class)
-						return criteria.is(firstParameter);
-					else {
-						// it means it's a simple find with exact geopoint matching (e.g. findByLocation)
-						// and because Elasticsearch does not have any kind of query with just a geopoint
-						// as argument we use a "geo distance" query with a distance of one meter.
-						secondParameter = ".001km";
-					}
-				} else {
-					secondParameter = parameters.next();
-				}
-
-				if (firstParameter instanceof GeoPoint && secondParameter instanceof String)
-					return criteria.within((GeoPoint) firstParameter, (String) secondParameter);
-
-				if (firstParameter instanceof Point && secondParameter instanceof Distance)
-					return criteria.within((Point) firstParameter, (Distance) secondParameter);
-
-				if (firstParameter instanceof String && secondParameter instanceof String)
-					return criteria.within((String) firstParameter, (String) secondParameter);
-			}
-			case NEAR: {
-				Object firstParameter = parameters.next();
-
-				if (firstParameter instanceof GeoBox) {
-					return criteria.boundedBy((GeoBox) firstParameter);
-				}
-
-				if (firstParameter instanceof Box) {
-					return criteria.boundedBy(GeoBox.fromBox((Box) firstParameter));
-				}
-
-				Object secondParameter = parameters.next();
-
-				// "near" query can be the same query as the "within" query
-				if (firstParameter instanceof GeoPoint && secondParameter instanceof String)
-					return criteria.within((GeoPoint) firstParameter, (String) secondParameter);
-
-				if (firstParameter instanceof Point && secondParameter instanceof Distance)
-					return criteria.within((Point) firstParameter, (Distance) secondParameter);
-
-				if (firstParameter instanceof String && secondParameter instanceof String)
-					return criteria.within((String) firstParameter, (String) secondParameter);
-			}
-
-			default:
-				throw new InvalidDataAccessApiUsageException("Illegal criteria found '" + type + "'.");
-		}
-	}
-
-	private Object[] asArray(Object o) {
-		if (o instanceof Collection) {
-			return ((Collection<?>) o).toArray();
-		} else if (o.getClass().isArray()) {
-			return (Object[]) o;
-		}
-		return new Object[]{o};
-	}
-}
+/*
+ * 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.query.parser;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.elasticsearch.core.geo.GeoBox;
+import org.springframework.data.elasticsearch.core.geo.GeoPoint;
+import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
+import org.springframework.data.elasticsearch.core.query.Criteria;
+import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
+import org.springframework.data.geo.Box;
+import org.springframework.data.geo.Distance;
+import org.springframework.data.geo.Point;
+import org.springframework.data.mapping.context.MappingContext;
+import org.springframework.data.mapping.context.PersistentPropertyPath;
+import org.springframework.data.repository.query.ParameterAccessor;
+import org.springframework.data.repository.query.parser.AbstractQueryCreator;
+import org.springframework.data.repository.query.parser.Part;
+import org.springframework.data.repository.query.parser.PartTree;
+
+/**
+ * ElasticsearchQueryCreator
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Franck Marchand
+ * @author Artur Konczak
+ */
+public class ElasticsearchQueryCreator extends AbstractQueryCreator<CriteriaQuery, CriteriaQuery> {
+
+	private final MappingContext<?, ElasticsearchPersistentProperty> context;
+
+	public ElasticsearchQueryCreator(PartTree tree, ParameterAccessor parameters,
+									 MappingContext<?, ElasticsearchPersistentProperty> context) {
+		super(tree, parameters);
+		this.context = context;
+	}
+
+	public ElasticsearchQueryCreator(PartTree tree, MappingContext<?, ElasticsearchPersistentProperty> context) {
+		super(tree);
+		this.context = context;
+	}
+
+	@Override
+	protected CriteriaQuery create(Part part, Iterator<Object> iterator) {
+		PersistentPropertyPath<ElasticsearchPersistentProperty> path = context
+				.getPersistentPropertyPath(part.getProperty());
+		return new CriteriaQuery(from(part,
+				new Criteria(path.toDotPath(ElasticsearchPersistentProperty.PropertyToFieldNameConverter.INSTANCE)), iterator));
+	}
+
+	@Override
+	protected CriteriaQuery and(Part part, CriteriaQuery base, Iterator<Object> iterator) {
+		if (base == null) {
+			return create(part, iterator);
+		}
+		PersistentPropertyPath<ElasticsearchPersistentProperty> path = context
+				.getPersistentPropertyPath(part.getProperty());
+		return base.addCriteria(from(part,
+				new Criteria(path.toDotPath(ElasticsearchPersistentProperty.PropertyToFieldNameConverter.INSTANCE)), iterator));
+	}
+
+	@Override
+	protected CriteriaQuery or(CriteriaQuery base, CriteriaQuery query) {
+		return new CriteriaQuery(base.getCriteria().or(query.getCriteria()));
+	}
+
+	@Override
+	protected CriteriaQuery complete(CriteriaQuery query, Sort sort) {
+		if (query == null) {
+			return null;
+		}
+		return query.addSort(sort);
+	}
+
+	private Criteria from(Part part, Criteria instance, Iterator<?> parameters) {
+		Part.Type type = part.getType();
+
+		Criteria criteria = instance;
+		if (criteria == null) {
+			criteria = new Criteria();
+		}
+		switch (type) {
+			case TRUE:
+				return criteria.is(true);
+			case FALSE:
+				return criteria.is(false);
+			case NEGATING_SIMPLE_PROPERTY:
+				return criteria.is(parameters.next()).not();
+			case REGEX:
+				return criteria.expression(parameters.next().toString());
+			case LIKE:
+			case STARTING_WITH:
+				return criteria.startsWith(parameters.next().toString());
+			case ENDING_WITH:
+				return criteria.endsWith(parameters.next().toString());
+			case CONTAINING:
+				return criteria.contains(parameters.next().toString());
+			case GREATER_THAN:
+				return criteria.greaterThan(parameters.next());
+			case AFTER:
+			case GREATER_THAN_EQUAL:
+				return criteria.greaterThanEqual(parameters.next());
+			case LESS_THAN:
+				return criteria.lessThan(parameters.next());
+			case BEFORE:
+			case LESS_THAN_EQUAL:
+				return criteria.lessThanEqual(parameters.next());
+			case BETWEEN:
+				return criteria.between(parameters.next(), parameters.next());
+			case IN:
+				return criteria.in(asArray(parameters.next()));
+			case NOT_IN:
+				return criteria.notIn(asArray(parameters.next()));
+			case SIMPLE_PROPERTY:
+			case WITHIN: {
+				Object firstParameter = parameters.next();
+				Object secondParameter = null;
+				if (type == Part.Type.SIMPLE_PROPERTY) {
+					if (part.getProperty().getType() != GeoPoint.class)
+						return criteria.is(firstParameter);
+					else {
+						// it means it's a simple find with exact geopoint matching (e.g. findByLocation)
+						// and because Elasticsearch does not have any kind of query with just a geopoint
+						// as argument we use a "geo distance" query with a distance of one meter.
+						secondParameter = ".001km";
+					}
+				} else {
+					secondParameter = parameters.next();
+				}
+
+				if (firstParameter instanceof GeoPoint && secondParameter instanceof String)
+					return criteria.within((GeoPoint) firstParameter, (String) secondParameter);
+
+				if (firstParameter instanceof Point && secondParameter instanceof Distance)
+					return criteria.within((Point) firstParameter, (Distance) secondParameter);
+
+				if (firstParameter instanceof String && secondParameter instanceof String)
+					return criteria.within((String) firstParameter, (String) secondParameter);
+			}
+			case NEAR: {
+				Object firstParameter = parameters.next();
+
+				if (firstParameter instanceof GeoBox) {
+					return criteria.boundedBy((GeoBox) firstParameter);
+				}
+
+				if (firstParameter instanceof Box) {
+					return criteria.boundedBy(GeoBox.fromBox((Box) firstParameter));
+				}
+
+				Object secondParameter = parameters.next();
+
+				// "near" query can be the same query as the "within" query
+				if (firstParameter instanceof GeoPoint && secondParameter instanceof String)
+					return criteria.within((GeoPoint) firstParameter, (String) secondParameter);
+
+				if (firstParameter instanceof Point && secondParameter instanceof Distance)
+					return criteria.within((Point) firstParameter, (Distance) secondParameter);
+
+				if (firstParameter instanceof String && secondParameter instanceof String)
+					return criteria.within((String) firstParameter, (String) secondParameter);
+			}
+
+			default:
+				throw new InvalidDataAccessApiUsageException("Illegal criteria found '" + type + "'.");
+		}
+	}
+
+	private Object[] asArray(Object o) {
+		if (o instanceof Collection) {
+			return ((Collection<?>) o).toArray();
+		} else if (o.getClass().isArray()) {
+			return (Object[]) o;
+		}
+		return new Object[]{o};
+	}
+}

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.
@@ -43,6 +43,7 @@ import org.springframework.util.Assert;
  * @author Mohsin Husen
  * @author Ryan Henszey
  * @author Kevin Leturc
+ * @author Mark Paluch
  */
 public abstract class AbstractElasticsearchRepository<T, ID extends Serializable> implements
 		ElasticsearchRepository<T, ID> {
@@ -56,14 +57,18 @@ public abstract class AbstractElasticsearchRepository<T, ID extends Serializable
 	}
 
 	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) {
 		this(elasticsearchOperations);
-		Assert.notNull(metadata);
+		
+		Assert.notNull(metadata, "ElasticsearchEntityInformation must not be null!");
+		
 		this.entityInformation = metadata;
 		setEntityClass(this.entityInformation.getJavaType());
 		try {
@@ -276,6 +281,7 @@ public abstract class AbstractElasticsearchRepository<T, ID extends Serializable
 		return resolveReturnedClassFromGenericType(clazz.getSuperclass());
 	}
 
+	@Override
 	public Class<T> getEntityClass() {
 		if (!isEntityClassSet()) {
 			try {

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

@@ -1,39 +1,39 @@
-/*
- * 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.io.Serializable;
-
-import org.springframework.data.repository.core.EntityInformation;
-
-/**
- * @param <T>
- * @param <ID>
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public interface ElasticsearchEntityInformation<T, ID extends Serializable> extends EntityInformation<T, ID> {
-
-	String getIdAttribute();
-
-	String getIndexName();
-
-	String getType();
-
-	Long getVersion(T entity);
-
-	String getParentId(T entity);
-}
+/*
+ * 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.io.Serializable;
+
+import org.springframework.data.repository.core.EntityInformation;
+
+/**
+ * @param <T>
+ * @param <ID>
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public interface ElasticsearchEntityInformation<T, ID extends Serializable> extends EntityInformation<T, ID> {
+
+	String getIdAttribute();
+
+	String getIndexName();
+
+	String getType();
+
+	Long getVersion(T entity);
+
+	String getParentId(T entity);
+}

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

@@ -1,29 +1,29 @@
-/*
- * 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.io.Serializable;
-
-/**
- * ElasticsearchEntityInformationCreator
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public interface ElasticsearchEntityInformationCreator {
-
-	<T, ID extends Serializable> ElasticsearchEntityInformation<T, ID> getEntityInformation(Class<T> domainClass);
-}
+/*
+ * 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.io.Serializable;
+
+/**
+ * ElasticsearchEntityInformationCreator
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public interface ElasticsearchEntityInformationCreator {
+
+	<T, ID extends Serializable> ElasticsearchEntityInformation<T, ID> getEntityInformation(Class<T> domainClass);
+}

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

@@ -1,54 +1,57 @@
-/*
- * 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.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;
-import org.springframework.util.Assert;
-
-/**
- * ElasticsearchEntityInformationCreatorImpl
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Oliver Gierke
- */
-public class ElasticsearchEntityInformationCreatorImpl implements ElasticsearchEntityInformationCreator {
-
-	private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext;
-
-	public ElasticsearchEntityInformationCreatorImpl(
-			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
-		Assert.notNull(mappingContext);
-		this.mappingContext = mappingContext;
-	}
-
-	@Override
-	@SuppressWarnings("unchecked")
-	public <T, ID extends Serializable> ElasticsearchEntityInformation<T, ID> getEntityInformation(Class<T> domainClass) {
-
-		ElasticsearchPersistentEntity<T> persistentEntity = (ElasticsearchPersistentEntity<T>) mappingContext
-				.getPersistentEntity(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);
-	}
-}
+/*
+ * 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 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;
+import org.springframework.util.Assert;
+
+/**
+ * ElasticsearchEntityInformationCreatorImpl
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Oliver Gierke
+ * @author Mark Paluch
+ */
+public class ElasticsearchEntityInformationCreatorImpl implements ElasticsearchEntityInformationCreator {
+
+	private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext;
+
+	public ElasticsearchEntityInformationCreatorImpl(
+			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> 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) {
+
+		ElasticsearchPersistentEntity<T> persistentEntity = (ElasticsearchPersistentEntity<T>) mappingContext
+				.getPersistentEntity(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);
+	}
+}

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

@@ -1,115 +1,122 @@
-/*
- * 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.io.Serializable;
+import java.lang.reflect.Method;
+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.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
+ * @author Gad Akuka
+ * @author Mark Paluch
+ */
+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 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 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 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);
+		}
+	}
+}

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,101 @@
-/*
- * 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-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;
+	}
+}

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

@@ -1,47 +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 org.springframework.data.elasticsearch.core.ElasticsearchOperations;
-
-/**
- * Elasticsearch specific repository implementation. Likely to be used as target within
- * {@link ElasticsearchRepositoryFactory}
- *
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Ryan Henszey
- */
-public class SimpleElasticsearchRepository<T> extends AbstractElasticsearchRepository<T, String> {
-
-	public SimpleElasticsearchRepository() {
-		super();
-	}
-
-	public SimpleElasticsearchRepository(ElasticsearchEntityInformation<T, String> metadata,
-										 ElasticsearchOperations elasticsearchOperations) {
-		super(metadata, elasticsearchOperations);
-	}
-
-	public SimpleElasticsearchRepository(ElasticsearchOperations elasticsearchOperations) {
-		super(elasticsearchOperations);
-	}
-
-	@Override
-	protected String stringIdRepresentation(String id) {
-		return id;
-	}
-}
+/*
+ * 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 org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+
+/**
+ * Elasticsearch specific repository implementation. Likely to be used as target within
+ * {@link ElasticsearchRepositoryFactory}
+ *
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Ryan Henszey
+ */
+public class SimpleElasticsearchRepository<T> extends AbstractElasticsearchRepository<T, String> {
+
+	public SimpleElasticsearchRepository() {
+		super();
+	}
+
+	public SimpleElasticsearchRepository(ElasticsearchEntityInformation<T, String> metadata,
+										 ElasticsearchOperations elasticsearchOperations) {
+		super(metadata, elasticsearchOperations);
+	}
+
+	public SimpleElasticsearchRepository(ElasticsearchOperations elasticsearchOperations) {
+		super(elasticsearchOperations);
+	}
+
+	@Override
+	protected String stringIdRepresentation(String id) {
+		return id;
+	}
+}

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,332 @@
 Spring Data Elasticsearch Changelog
 ===================================
 
+Changes in version 2.1.14.RELEASE (2018-07-27)
+----------------------------------------------
+* DATAES-463 - Release 2.1.14 (Ingalls SR14).
+* DATAES-283 - Remove dependency to Commons Lang.
+
+
+Changes in version 3.0.9.RELEASE (2018-07-26)
+---------------------------------------------
+* DATAES-470 - TransportClientFactoryBean does not parse clusterNodes correctly.
+* DATAES-469 - Is org.elasticsearch:elasticsearch a necessary dependency?.
+* DATAES-467 - No mapping found for [_score] in order to sort on.
+* DATAES-465 - Release 3.0.9 (Kay SR9).
+* DATAES-317 - Add query logging to ElasticsearchTemplate.
+* DATAES-283 - Remove dependency to Commons Lang.
+
+
+Changes in version 3.1.0.RC1 (2018-07-26)
+-----------------------------------------
+* DATAES-471 - Adapt to changes in immutable entities support.
+* DATAES-470 - TransportClientFactoryBean does not parse clusterNodes correctly.
+* DATAES-469 - Is org.elasticsearch:elasticsearch a necessary dependency?.
+* DATAES-467 - No mapping found for [_score] in order to sort on.
+* DATAES-464 - Add support for @ReadOnlyProperty to prevent properties from being written.
+* DATAES-462 - Add support for mapping document scores to entities.
+* DATAES-452 - Release 3.1 RC1 (Lovelace).
+* DATAES-317 - Add query logging to ElasticsearchTemplate.
+
+
+Changes in version 3.0.8.RELEASE (2018-06-13)
+---------------------------------------------
+* DATAES-460 - Avoid pulling in Netty 3 as dependency.
+* DATAES-448 - Release 3.0.8 (Kay SR8).
+* DATAES-420 - Analyzer of main field ignored when using @MultiField annotation.
+* DATAES-312 - NullHandling.NULLS_LAST not working in query.sort.
+
+
+Changes in version 2.1.13.RELEASE (2018-06-13)
+----------------------------------------------
+* DATAES-447 - Release 2.1.13 (Ingalls SR13).
+
+
+Changes in version 3.1.0.M3 (2018-05-17)
+----------------------------------------
+* DATAES-451 - Adapt to SpEL extension API changes in Spring Data Commons.
+* DATAES-440 - Release 3.1 M3 (Lovelace).
+* DATAES-422 - Add support for IndicesOptions in search queries.
+* DATAES-420 - Analyzer of main field ignored when using @MultiField annotation.
+* DATAES-412 - Highlighted fields is not getting passed to the elastic search query.
+* DATAES-363 - AbstractElasticsearchRepository.existsById(..) always returns true.
+* DATAES-312 - NullHandling.NULLS_LAST not working in query.sort.
+* DATAES-198 - @Version has no effect, so therefore is not useful with spring data elasticsearch.
+
+
+Changes in version 3.0.7.RELEASE (2018-05-08)
+---------------------------------------------
+* DATAES-438 - Expected a boolean [true/false] for property [index] but got [not_analyzed].
+* DATAES-437 - Release 3.0.7 (Kay SR7).
+* DATAES-412 - Highlighted fields is not getting passed to the elastic search query.
+* DATAES-402 - Paging not working correctly.
+* DATAES-363 - AbstractElasticsearchRepository.existsById(..) always returns true.
+* DATAES-198 - @Version has no effect, so therefore is not useful with spring data elasticsearch.
+
+
+Changes in version 2.1.12.RELEASE (2018-05-08)
+----------------------------------------------
+* DATAES-436 - Release 2.1.12 (Ingalls SR12).
+
+
+Changes in version 3.1.0.M2 (2018-04-13)
+----------------------------------------
+* DATAES-439 - Adapt to API changes in Spring Data Commons.
+* DATAES-434 - Remove explicit declaration of Jackson library versions.
+* DATAES-432 - Export composable repositories via CDI.
+* DATAES-427 - Release 3.1 M2 (Lovelace).
+
+
+Changes in version 3.0.6.RELEASE (2018-04-04)
+---------------------------------------------
+* DATAES-434 - Remove explicit declaration of Jackson library versions.
+* DATAES-430 - Release 3.0.6 (Kay SR6).
+
+
+Changes in version 2.1.11.RELEASE (2018-04-04)
+----------------------------------------------
+* DATAES-434 - Remove explicit declaration of Jackson library versions.
+* DATAES-424 - Fix line endings.
+* DATAES-423 - Release 2.1.11 (Ingalls SR11).
+
+
+Changes in version 3.0.5.RELEASE (2018-02-28)
+---------------------------------------------
+* DATAES-429 - Release 3.0.5 (Kay SR5).
+
+
+Changes in version 3.0.4.RELEASE (2018-02-19)
+---------------------------------------------
+* DATAES-425 - Release 3.0.4 (Kay SR4).
+
+
+Changes in version 3.1.0.M1 (2018-02-06)
+----------------------------------------
+* DATAES-424 - Fix line endings.
+* DATAES-414 - Reduce scope of Lo4j dependencies to test.
+* DATAES-410 - Adapt API changes in Property in test cases.
+* DATAES-401 - Release 3.1 M1 (Lovelace).
+* DATAES-361 - log4j2.xml in classpath root of the library prevents Spring Boot's logging auto-configuration to work.
+
+
+Changes in version 3.0.3.RELEASE (2018-01-24)
+---------------------------------------------
+* DATAES-424 - Fix line endings.
+* DATAES-417 - Release 3.0.3 (Kay SR3).
+
+
+Changes in version 2.1.10.RELEASE (2018-01-24)
+----------------------------------------------
+* DATAES-416 - Release 2.1.10 (Ingalls SR10).
+
+
+Changes in version 3.0.2.RELEASE (2017-11-27)
+---------------------------------------------
+* DATAES-414 - Reduce scope of Lo4j dependencies to test.
+* DATAES-411 - Release 3.0.2 (Kay SR2).
+
+
+Changes in version 2.1.9.RELEASE (2017-11-27)
+---------------------------------------------
+* DATAES-408 - Ensure Spring 5 compatibility in Ingalls.
+* DATAES-404 - Release 2.1.9 (Ingalls SR9).
+
+
+Changes in version 3.0.1.RELEASE (2017-10-27)
+---------------------------------------------
+* DATAES-410 - Adapt API changes in Property in test cases.
+* DATAES-400 - Release 3.0.1 (Kay SR1).
+* DATAES-361 - log4j2.xml in classpath root of the library prevents Spring Boot's logging auto-configuration to work.
+
+
+Changes in version 2.1.8.RELEASE (2017-10-11)
+---------------------------------------------
+* DATAES-391 - Release 2.1.8 (Ingalls SR8).
+
+
+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/notice.txt

@@ -1,4 +1,4 @@
-Spring Data Elasticsearch 2.0 GA
+Spring Data Elasticsearch 2.1.14
 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,72 +1,72 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.data.elasticsearch;
-
-import static org.apache.commons.lang.RandomStringUtils.*;
-import static org.hamcrest.Matchers.*;
-import static org.junit.Assert.*;
-
-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.ElasticsearchTemplate;
-import org.springframework.data.elasticsearch.entities.Author;
-import org.springframework.data.elasticsearch.entities.Book;
-import org.springframework.data.elasticsearch.repositories.book.SampleElasticSearchBookRepository;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-/**
- * @author Mohsin Husen
- */
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:/repository-test-nested-object.xml")
-public class InnerObjectTests {
-
-	@Autowired
-	private SampleElasticSearchBookRepository bookRepository;
-
-	@Autowired
-	private ElasticsearchTemplate elasticsearchTemplate;
-
-	@Before
-	public void before() {
-		elasticsearchTemplate.deleteIndex(Book.class);
-		elasticsearchTemplate.createIndex(Book.class);
-		elasticsearchTemplate.putMapping(Book.class);
-		elasticsearchTemplate.refresh(Book.class);
-	}
-
-	@Test
-	public void shouldIndexInnerObject() {
-		// given
-		String id = randomAlphanumeric(5);
-		Book book = new Book();
-		book.setId(id);
-		book.setName("xyz");
-		Author author = new Author();
-		author.setId("1");
-		author.setName("ABC");
-		book.setAuthor(author);
-		// when
-		bookRepository.save(book);
-		// then
-		assertThat(bookRepository.findOne(id), is(notNullValue()));
-	}
-}
+/*
+ * Copyright 2014-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.data.elasticsearch;
+
+import static org.apache.commons.lang.RandomStringUtils.*;
+import static org.hamcrest.Matchers.*;
+import static org.junit.Assert.*;
+
+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.ElasticsearchTemplate;
+import org.springframework.data.elasticsearch.entities.Author;
+import org.springframework.data.elasticsearch.entities.Book;
+import org.springframework.data.elasticsearch.repositories.book.SampleElasticSearchBookRepository;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Mohsin Husen
+ */
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:/repository-test-nested-object.xml")
+public class InnerObjectTests {
+
+	@Autowired
+	private SampleElasticSearchBookRepository bookRepository;
+
+	@Autowired
+	private ElasticsearchTemplate elasticsearchTemplate;
+
+	@Before
+	public void before() {
+		elasticsearchTemplate.deleteIndex(Book.class);
+		elasticsearchTemplate.createIndex(Book.class);
+		elasticsearchTemplate.putMapping(Book.class);
+		elasticsearchTemplate.refresh(Book.class);
+	}
+
+	@Test
+	public void shouldIndexInnerObject() {
+		// given
+		String id = randomAlphanumeric(5);
+		Book book = new Book();
+		book.setId(id);
+		book.setName("xyz");
+		Author author = new Author();
+		author.setId("1");
+		author.setName("ABC");
+		book.setAuthor(author);
+		// when
+		bookRepository.save(book);
+		// then
+		assertThat(bookRepository.findOne(id), is(notNullValue()));
+	}
+}

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

@@ -1,387 +1,387 @@
-/*
- * Copyright 2013-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch;
-
-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.hamcrest.CoreMatchers.is;
-import static org.hamcrest.Matchers.notNullValue;
-import static org.junit.Assert.assertThat;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.elasticsearch.index.query.BoolQueryBuilder;
-import org.elasticsearch.index.query.QueryBuilder;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.domain.Page;
-import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
-import org.springframework.data.elasticsearch.core.query.GetQuery;
-import org.springframework.data.elasticsearch.core.query.IndexQuery;
-import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
-import org.springframework.data.elasticsearch.core.query.SearchQuery;
-import org.springframework.data.elasticsearch.entities.Author;
-import org.springframework.data.elasticsearch.entities.Book;
-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;
-
-/**
- * @author Rizwan Idrees
- * @author Mohsin Husen
- * @author Artur Konczak
- */
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("classpath:/repository-test-nested-object.xml")
-public class NestedObjectTests {
-
-	@Autowired
-	private ElasticsearchTemplate elasticsearchTemplate;
-
-
-	@Before
-	public void before() {
-		elasticsearchTemplate.deleteIndex(Book.class);
-		elasticsearchTemplate.createIndex(Book.class);
-		elasticsearchTemplate.putMapping(Book.class);
-		elasticsearchTemplate.refresh(Book.class);
-		elasticsearchTemplate.deleteIndex(Person.class);
-		elasticsearchTemplate.createIndex(Person.class);
-		elasticsearchTemplate.putMapping(Person.class);
-		elasticsearchTemplate.refresh(Person.class);
-		elasticsearchTemplate.deleteIndex(PersonMultipleLevelNested.class);
-		elasticsearchTemplate.createIndex(PersonMultipleLevelNested.class);
-		elasticsearchTemplate.putMapping(PersonMultipleLevelNested.class);
-		elasticsearchTemplate.refresh(PersonMultipleLevelNested.class);
-	}
-
-	@Test
-	public void shouldIndexInitialLevelNestedObject() {
-
-		final List<Car> cars = new ArrayList<Car>();
-
-		final Car saturn = new Car();
-		saturn.setName("Saturn");
-		saturn.setModel("SL");
-
-		final Car subaru = new Car();
-		subaru.setName("Subaru");
-		subaru.setModel("Imprezza");
-
-		final Car ford = new Car();
-		ford.setName("Ford");
-		ford.setModel("Focus");
-
-		cars.add(saturn);
-		cars.add(subaru);
-		cars.add(ford);
-
-		final Person foo = new Person();
-		foo.setName("Foo");
-		foo.setId("1");
-		foo.setCar(cars);
-
-		final Car car = new Car();
-		car.setName("Saturn");
-		car.setModel("Imprezza");
-
-		final Person bar = new Person();
-		bar.setId("2");
-		bar.setName("Bar");
-		bar.setCar(Arrays.asList(car));
-
-		final List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
-		final IndexQuery indexQuery1 = new IndexQuery();
-		indexQuery1.setId(foo.getId());
-		indexQuery1.setObject(foo);
-
-		final IndexQuery indexQuery2 = new IndexQuery();
-		indexQuery2.setId(bar.getId());
-		indexQuery2.setObject(bar);
-
-		indexQueries.add(indexQuery1);
-		indexQueries.add(indexQuery2);
-
-		elasticsearchTemplate.putMapping(Person.class);
-		elasticsearchTemplate.bulkIndex(indexQueries);
-		elasticsearchTemplate.refresh(Person.class);
-
-		final QueryBuilder builder = nestedQuery("car", boolQuery().must(termQuery("car.name", "saturn")).must(termQuery("car.model", "imprezza")));
-
-		final SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(builder).build();
-		final List<Person> persons = elasticsearchTemplate.queryForList(searchQuery, Person.class);
-
-		assertThat(persons.size(), is(1));
-	}
-
-	@Test
-	public void shouldIndexMultipleLevelNestedObject() {
-		//given
-		final List<IndexQuery> indexQueries = createPerson();
-
-		//when
-		elasticsearchTemplate.putMapping(PersonMultipleLevelNested.class);
-		elasticsearchTemplate.bulkIndex(indexQueries);
-		elasticsearchTemplate.refresh(PersonMultipleLevelNested.class);
-
-		//then
-		final GetQuery getQuery = new GetQuery();
-		getQuery.setId("1");
-		final PersonMultipleLevelNested personIndexed = elasticsearchTemplate.queryForObject(getQuery, PersonMultipleLevelNested.class);
-		assertThat(personIndexed, is(notNullValue()));
-	}
-
-	@Test
-	public void shouldIndexMultipleLevelNestedObjectWithIncludeInParent() {
-		//given
-		final List<IndexQuery> indexQueries = createPerson();
-
-		//when
-		elasticsearchTemplate.putMapping(PersonMultipleLevelNested.class);
-		elasticsearchTemplate.bulkIndex(indexQueries);
-		// then 
-
-		final Map mapping = elasticsearchTemplate.getMapping(PersonMultipleLevelNested.class);
-
-		assertThat(mapping, is(notNullValue()));
-		final Map propertyMap = (Map) mapping.get("properties");
-		assertThat(propertyMap, is(notNullValue()));
-		final Map bestCarsAttributes = (Map) propertyMap.get("bestCars");
-		assertThat(bestCarsAttributes.get("include_in_parent"), is(notNullValue()));
-	}
-
-
-	@Test
-	public void shouldSearchUsingNestedQueryOnMultipleLevelNestedObject() {
-		//given
-		final List<IndexQuery> indexQueries = createPerson();
-
-		//when
-		elasticsearchTemplate.putMapping(PersonMultipleLevelNested.class);
-		elasticsearchTemplate.bulkIndex(indexQueries);
-		elasticsearchTemplate.refresh(PersonMultipleLevelNested.class);
-
-		//then
-		final BoolQueryBuilder builder = boolQuery();
-		builder.must(nestedQuery("girlFriends", termQuery("girlFriends.type", "temp")))
-				.must(nestedQuery("girlFriends.cars", termQuery("girlFriends.cars.name", "Ford".toLowerCase())));
-
-		final SearchQuery searchQuery = new NativeSearchQueryBuilder()
-				.withQuery(builder)
-				.build();
-
-		final Page<PersonMultipleLevelNested> personIndexed = elasticsearchTemplate.queryForPage(searchQuery, PersonMultipleLevelNested.class);
-		assertThat(personIndexed, is(notNullValue()));
-		assertThat(personIndexed.getTotalElements(), is(1L));
-		assertThat(personIndexed.getContent().get(0).getId(), is("1"));
-	}
-
-
-	private List<IndexQuery> createPerson() {
-
-		final PersonMultipleLevelNested person1 = new PersonMultipleLevelNested();
-
-		person1.setId("1");
-		person1.setName("name");
-
-		final Car saturn = new Car();
-		saturn.setName("Saturn");
-		saturn.setModel("SL");
-
-		final Car subaru = new Car();
-		subaru.setName("Subaru");
-		subaru.setModel("Imprezza");
-
-		final Car car = new Car();
-		car.setName("Saturn");
-		car.setModel("Imprezza");
-
-		final Car ford = new Car();
-		ford.setName("Ford");
-		ford.setModel("Focus");
-
-		final GirlFriend permanent = new GirlFriend();
-		permanent.setName("permanent");
-		permanent.setType("permanent");
-		permanent.setCars(Arrays.asList(saturn, subaru));
-
-		final GirlFriend temp = new GirlFriend();
-		temp.setName("temp");
-		temp.setType("temp");
-		temp.setCars(Arrays.asList(car, ford));
-
-		person1.setGirlFriends(Arrays.asList(permanent, temp));
-
-		final IndexQuery indexQuery1 = new IndexQuery();
-		indexQuery1.setId(person1.getId());
-		indexQuery1.setObject(person1);
-
-		final PersonMultipleLevelNested person2 = new PersonMultipleLevelNested();
-
-		person2.setId("2");
-		person2.setName("name");
-
-		person2.setGirlFriends(Arrays.asList(permanent));
-
-		final IndexQuery indexQuery2 = new IndexQuery();
-		indexQuery2.setId(person2.getId());
-		indexQuery2.setObject(person2);
-
-		final List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
-		indexQueries.add(indexQuery1);
-		indexQueries.add(indexQuery2);
-
-		return indexQueries;
-	}
-
-	@Test
-	public void shouldSearchBooksForPersonInitialLevelNestedType() {
-
-		final List<Car> cars = new ArrayList<Car>();
-
-		final Car saturn = new Car();
-		saturn.setName("Saturn");
-		saturn.setModel("SL");
-
-		final Car subaru = new Car();
-		subaru.setName("Subaru");
-		subaru.setModel("Imprezza");
-
-		final Car ford = new Car();
-		ford.setName("Ford");
-		ford.setModel("Focus");
-
-		cars.add(saturn);
-		cars.add(subaru);
-		cars.add(ford);
-
-		final Book java = new Book();
-		java.setId("1");
-		java.setName("java");
-		final Author javaAuthor = new Author();
-		javaAuthor.setId("1");
-		javaAuthor.setName("javaAuthor");
-		java.setAuthor(javaAuthor);
-
-		final Book spring = new Book();
-		spring.setId("2");
-		spring.setName("spring");
-		final Author springAuthor = new Author();
-		springAuthor.setId("2");
-		springAuthor.setName("springAuthor");
-		spring.setAuthor(springAuthor);
-
-		final Person foo = new Person();
-		foo.setName("Foo");
-		foo.setId("1");
-		foo.setCar(cars);
-		foo.setBooks(Arrays.asList(java, spring));
-
-		final Car car = new Car();
-		car.setName("Saturn");
-		car.setModel("Imprezza");
-
-		final Person bar = new Person();
-		bar.setId("2");
-		bar.setName("Bar");
-		bar.setCar(Arrays.asList(car));
-
-		final List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
-		final IndexQuery indexQuery1 = new IndexQuery();
-		indexQuery1.setId(foo.getId());
-		indexQuery1.setObject(foo);
-
-		final IndexQuery indexQuery2 = new IndexQuery();
-		indexQuery2.setId(bar.getId());
-		indexQuery2.setObject(bar);
-
-		indexQueries.add(indexQuery1);
-		indexQueries.add(indexQuery2);
-
-		elasticsearchTemplate.putMapping(Person.class);
-		elasticsearchTemplate.bulkIndex(indexQueries);
-		elasticsearchTemplate.refresh(Person.class);
-
-		final QueryBuilder builder = nestedQuery("books", boolQuery().must(termQuery("books.name", "java")));
-
-		final SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(builder).build();
-		final List<Person> persons = elasticsearchTemplate.queryForList(searchQuery, Person.class);
-
-		assertThat(persons.size(), is(1));
-	}
-
-	/*
-	DATAES-73
-	 */
-	@Test
-	public void shouldIndexAndSearchMapAsNestedType() {
-		//given
-		final Book book1 = new Book();
-		final Book book2 = new Book();
-
-		book1.setId(randomNumeric(5));
-		book1.setName("testBook1");
-
-		book2.setId(randomNumeric(5));
-		book2.setName("testBook2");
-
-		final Map<Integer, Collection<String>> map1 = new HashMap<Integer, Collection<String>>();
-		map1.put(1, Arrays.asList("test1", "test2"));
-
-		final Map<Integer, Collection<String>> map2 = new HashMap<Integer, Collection<String>>();
-		map2.put(1, Arrays.asList("test3", "test4"));
-
-		book1.setBuckets(map1);
-		book2.setBuckets(map2);
-
-		final List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
-		final IndexQuery indexQuery1 = new IndexQuery();
-		indexQuery1.setId(book1.getId());
-		indexQuery1.setObject(book1);
-
-		final IndexQuery indexQuery2 = new IndexQuery();
-		indexQuery2.setId(book2.getId());
-		indexQuery2.setObject(book2);
-
-		indexQueries.add(indexQuery1);
-		indexQueries.add(indexQuery2);
-		//when
-		elasticsearchTemplate.bulkIndex(indexQueries);
-		elasticsearchTemplate.refresh(Book.class);
-		//then
-		final SearchQuery searchQuery = new NativeSearchQueryBuilder()
-				.withQuery(nestedQuery("buckets", termQuery("buckets.1", "test3")))
-				.build();
-		final Page<Book> books = elasticsearchTemplate.queryForPage(searchQuery, Book.class);
-
-		assertThat(books.getContent().size(), is(1));
-		assertThat(books.getContent().get(0).getId(), is(book2.getId()));
-	}
-}
-
+/*
+ * Copyright 2013-2016 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch;
+
+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.hamcrest.CoreMatchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.QueryBuilder;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.elasticsearch.core.ElasticsearchTemplate;
+import org.springframework.data.elasticsearch.core.query.GetQuery;
+import org.springframework.data.elasticsearch.core.query.IndexQuery;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
+import org.springframework.data.elasticsearch.core.query.SearchQuery;
+import org.springframework.data.elasticsearch.entities.Author;
+import org.springframework.data.elasticsearch.entities.Book;
+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;
+
+/**
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ * @author Artur Konczak
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("classpath:/repository-test-nested-object.xml")
+public class NestedObjectTests {
+
+	@Autowired
+	private ElasticsearchTemplate elasticsearchTemplate;
+
+
+	@Before
+	public void before() {
+		elasticsearchTemplate.deleteIndex(Book.class);
+		elasticsearchTemplate.createIndex(Book.class);
+		elasticsearchTemplate.putMapping(Book.class);
+		elasticsearchTemplate.refresh(Book.class);
+		elasticsearchTemplate.deleteIndex(Person.class);
+		elasticsearchTemplate.createIndex(Person.class);
+		elasticsearchTemplate.putMapping(Person.class);
+		elasticsearchTemplate.refresh(Person.class);
+		elasticsearchTemplate.deleteIndex(PersonMultipleLevelNested.class);
+		elasticsearchTemplate.createIndex(PersonMultipleLevelNested.class);
+		elasticsearchTemplate.putMapping(PersonMultipleLevelNested.class);
+		elasticsearchTemplate.refresh(PersonMultipleLevelNested.class);
+	}
+
+	@Test
+	public void shouldIndexInitialLevelNestedObject() {
+
+		final List<Car> cars = new ArrayList<Car>();
+
+		final Car saturn = new Car();
+		saturn.setName("Saturn");
+		saturn.setModel("SL");
+
+		final Car subaru = new Car();
+		subaru.setName("Subaru");
+		subaru.setModel("Imprezza");
+
+		final Car ford = new Car();
+		ford.setName("Ford");
+		ford.setModel("Focus");
+
+		cars.add(saturn);
+		cars.add(subaru);
+		cars.add(ford);
+
+		final Person foo = new Person();
+		foo.setName("Foo");
+		foo.setId("1");
+		foo.setCar(cars);
+
+		final Car car = new Car();
+		car.setName("Saturn");
+		car.setModel("Imprezza");
+
+		final Person bar = new Person();
+		bar.setId("2");
+		bar.setName("Bar");
+		bar.setCar(Arrays.asList(car));
+
+		final List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		final IndexQuery indexQuery1 = new IndexQuery();
+		indexQuery1.setId(foo.getId());
+		indexQuery1.setObject(foo);
+
+		final IndexQuery indexQuery2 = new IndexQuery();
+		indexQuery2.setId(bar.getId());
+		indexQuery2.setObject(bar);
+
+		indexQueries.add(indexQuery1);
+		indexQueries.add(indexQuery2);
+
+		elasticsearchTemplate.putMapping(Person.class);
+		elasticsearchTemplate.bulkIndex(indexQueries);
+		elasticsearchTemplate.refresh(Person.class);
+
+		final QueryBuilder builder = nestedQuery("car", boolQuery().must(termQuery("car.name", "saturn")).must(termQuery("car.model", "imprezza")));
+
+		final SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(builder).build();
+		final List<Person> persons = elasticsearchTemplate.queryForList(searchQuery, Person.class);
+
+		assertThat(persons.size(), is(1));
+	}
+
+	@Test
+	public void shouldIndexMultipleLevelNestedObject() {
+		//given
+		final List<IndexQuery> indexQueries = createPerson();
+
+		//when
+		elasticsearchTemplate.putMapping(PersonMultipleLevelNested.class);
+		elasticsearchTemplate.bulkIndex(indexQueries);
+		elasticsearchTemplate.refresh(PersonMultipleLevelNested.class);
+
+		//then
+		final GetQuery getQuery = new GetQuery();
+		getQuery.setId("1");
+		final PersonMultipleLevelNested personIndexed = elasticsearchTemplate.queryForObject(getQuery, PersonMultipleLevelNested.class);
+		assertThat(personIndexed, is(notNullValue()));
+	}
+
+	@Test
+	public void shouldIndexMultipleLevelNestedObjectWithIncludeInParent() {
+		//given
+		final List<IndexQuery> indexQueries = createPerson();
+
+		//when
+		elasticsearchTemplate.putMapping(PersonMultipleLevelNested.class);
+		elasticsearchTemplate.bulkIndex(indexQueries);
+		// then 
+
+		final Map mapping = elasticsearchTemplate.getMapping(PersonMultipleLevelNested.class);
+
+		assertThat(mapping, is(notNullValue()));
+		final Map propertyMap = (Map) mapping.get("properties");
+		assertThat(propertyMap, is(notNullValue()));
+		final Map bestCarsAttributes = (Map) propertyMap.get("bestCars");
+		assertThat(bestCarsAttributes.get("include_in_parent"), is(notNullValue()));
+	}
+
+
+	@Test
+	public void shouldSearchUsingNestedQueryOnMultipleLevelNestedObject() {
+		//given
+		final List<IndexQuery> indexQueries = createPerson();
+
+		//when
+		elasticsearchTemplate.putMapping(PersonMultipleLevelNested.class);
+		elasticsearchTemplate.bulkIndex(indexQueries);
+		elasticsearchTemplate.refresh(PersonMultipleLevelNested.class);
+
+		//then
+		final BoolQueryBuilder builder = boolQuery();
+		builder.must(nestedQuery("girlFriends", termQuery("girlFriends.type", "temp")))
+				.must(nestedQuery("girlFriends.cars", termQuery("girlFriends.cars.name", "Ford".toLowerCase())));
+
+		final SearchQuery searchQuery = new NativeSearchQueryBuilder()
+				.withQuery(builder)
+				.build();
+
+		final Page<PersonMultipleLevelNested> personIndexed = elasticsearchTemplate.queryForPage(searchQuery, PersonMultipleLevelNested.class);
+		assertThat(personIndexed, is(notNullValue()));
+		assertThat(personIndexed.getTotalElements(), is(1L));
+		assertThat(personIndexed.getContent().get(0).getId(), is("1"));
+	}
+
+
+	private List<IndexQuery> createPerson() {
+
+		final PersonMultipleLevelNested person1 = new PersonMultipleLevelNested();
+
+		person1.setId("1");
+		person1.setName("name");
+
+		final Car saturn = new Car();
+		saturn.setName("Saturn");
+		saturn.setModel("SL");
+
+		final Car subaru = new Car();
+		subaru.setName("Subaru");
+		subaru.setModel("Imprezza");
+
+		final Car car = new Car();
+		car.setName("Saturn");
+		car.setModel("Imprezza");
+
+		final Car ford = new Car();
+		ford.setName("Ford");
+		ford.setModel("Focus");
+
+		final GirlFriend permanent = new GirlFriend();
+		permanent.setName("permanent");
+		permanent.setType("permanent");
+		permanent.setCars(Arrays.asList(saturn, subaru));
+
+		final GirlFriend temp = new GirlFriend();
+		temp.setName("temp");
+		temp.setType("temp");
+		temp.setCars(Arrays.asList(car, ford));
+
+		person1.setGirlFriends(Arrays.asList(permanent, temp));
+
+		final IndexQuery indexQuery1 = new IndexQuery();
+		indexQuery1.setId(person1.getId());
+		indexQuery1.setObject(person1);
+
+		final PersonMultipleLevelNested person2 = new PersonMultipleLevelNested();
+
+		person2.setId("2");
+		person2.setName("name");
+
+		person2.setGirlFriends(Arrays.asList(permanent));
+
+		final IndexQuery indexQuery2 = new IndexQuery();
+		indexQuery2.setId(person2.getId());
+		indexQuery2.setObject(person2);
+
+		final List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		indexQueries.add(indexQuery1);
+		indexQueries.add(indexQuery2);
+
+		return indexQueries;
+	}
+
+	@Test
+	public void shouldSearchBooksForPersonInitialLevelNestedType() {
+
+		final List<Car> cars = new ArrayList<Car>();
+
+		final Car saturn = new Car();
+		saturn.setName("Saturn");
+		saturn.setModel("SL");
+
+		final Car subaru = new Car();
+		subaru.setName("Subaru");
+		subaru.setModel("Imprezza");
+
+		final Car ford = new Car();
+		ford.setName("Ford");
+		ford.setModel("Focus");
+
+		cars.add(saturn);
+		cars.add(subaru);
+		cars.add(ford);
+
+		final Book java = new Book();
+		java.setId("1");
+		java.setName("java");
+		final Author javaAuthor = new Author();
+		javaAuthor.setId("1");
+		javaAuthor.setName("javaAuthor");
+		java.setAuthor(javaAuthor);
+
+		final Book spring = new Book();
+		spring.setId("2");
+		spring.setName("spring");
+		final Author springAuthor = new Author();
+		springAuthor.setId("2");
+		springAuthor.setName("springAuthor");
+		spring.setAuthor(springAuthor);
+
+		final Person foo = new Person();
+		foo.setName("Foo");
+		foo.setId("1");
+		foo.setCar(cars);
+		foo.setBooks(Arrays.asList(java, spring));
+
+		final Car car = new Car();
+		car.setName("Saturn");
+		car.setModel("Imprezza");
+
+		final Person bar = new Person();
+		bar.setId("2");
+		bar.setName("Bar");
+		bar.setCar(Arrays.asList(car));
+
+		final List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		final IndexQuery indexQuery1 = new IndexQuery();
+		indexQuery1.setId(foo.getId());
+		indexQuery1.setObject(foo);
+
+		final IndexQuery indexQuery2 = new IndexQuery();
+		indexQuery2.setId(bar.getId());
+		indexQuery2.setObject(bar);
+
+		indexQueries.add(indexQuery1);
+		indexQueries.add(indexQuery2);
+
+		elasticsearchTemplate.putMapping(Person.class);
+		elasticsearchTemplate.bulkIndex(indexQueries);
+		elasticsearchTemplate.refresh(Person.class);
+
+		final QueryBuilder builder = nestedQuery("books", boolQuery().must(termQuery("books.name", "java")));
+
+		final SearchQuery searchQuery = new NativeSearchQueryBuilder().withQuery(builder).build();
+		final List<Person> persons = elasticsearchTemplate.queryForList(searchQuery, Person.class);
+
+		assertThat(persons.size(), is(1));
+	}
+
+	/*
+	DATAES-73
+	 */
+	@Test
+	public void shouldIndexAndSearchMapAsNestedType() {
+		//given
+		final Book book1 = new Book();
+		final Book book2 = new Book();
+
+		book1.setId(randomNumeric(5));
+		book1.setName("testBook1");
+
+		book2.setId(randomNumeric(5));
+		book2.setName("testBook2");
+
+		final Map<Integer, Collection<String>> map1 = new HashMap<Integer, Collection<String>>();
+		map1.put(1, Arrays.asList("test1", "test2"));
+
+		final Map<Integer, Collection<String>> map2 = new HashMap<Integer, Collection<String>>();
+		map2.put(1, Arrays.asList("test3", "test4"));
+
+		book1.setBuckets(map1);
+		book2.setBuckets(map2);
+
+		final List<IndexQuery> indexQueries = new ArrayList<IndexQuery>();
+		final IndexQuery indexQuery1 = new IndexQuery();
+		indexQuery1.setId(book1.getId());
+		indexQuery1.setObject(book1);
+
+		final IndexQuery indexQuery2 = new IndexQuery();
+		indexQuery2.setId(book2.getId());
+		indexQuery2.setObject(book2);
+
+		indexQueries.add(indexQuery1);
+		indexQueries.add(indexQuery2);
+		//when
+		elasticsearchTemplate.bulkIndex(indexQueries);
+		elasticsearchTemplate.refresh(Book.class);
+		//then
+		final SearchQuery searchQuery = new NativeSearchQueryBuilder()
+				.withQuery(nestedQuery("buckets", termQuery("buckets.1", "test3")))
+				.build();
+		final Page<Book> books = elasticsearchTemplate.queryForPage(searchQuery, Book.class);
+
+		assertThat(books.getContent().size(), is(1));
+		assertThat(books.getContent().get(0).getId(), is(book2.getId()));
+	}
+}
+

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

@@ -1,35 +1,35 @@
-/*
- * 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.junit.Test;
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.springframework.data.elasticsearch.repositories.nondocument.NonDocumentEntityRepository;
-
-/**
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-public class NonDocumentEntityTests {
-
-	@Test(expected = BeanCreationException.class)
-	public void shouldNotInitialiseRepositoryWithNonDocument() {
-		// when
-		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("/repository-non-document-entity.xml");
-		ctx.getBean(NonDocumentEntityRepository.class);
-	}
-}
+/*
+ * 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.junit.Test;
+import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.data.elasticsearch.repositories.nondocument.NonDocumentEntityRepository;
+
+/**
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+public class NonDocumentEntityTests {
+
+	@Test(expected = BeanCreationException.class)
+	public void shouldNotInitialiseRepositoryWithNonDocument() {
+		// when
+		ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("/repository-non-document-entity.xml");
+		ctx.getBean(NonDocumentEntityRepository.class);
+	}
+}

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

@@ -0,0 +1,140 @@
+/*
+ * 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 java.util.UUID;
+
+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 Gad Akuka
+ */
+@Document(indexName = "test-index", type = "test-type", indexStoreType = "memory", shards = 1, replicas = 0, refreshInterval = "-1")
+public class SampleEntityUUIDKeyed {
+
+	@Id
+	private UUID 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 UUID getId() {
+		return id;
+	}
+
+	public void setId(UUID 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 SampleEntityUUIDKeyed)) {
+			return false;
+		}
+		if (this == obj) {
+			return true;
+		}
+		SampleEntityUUIDKeyed rhs = (SampleEntityUUIDKeyed) 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/config/ElasticsearchNamespaceHandlerTests.java

@@ -1,62 +1,62 @@
-/*
- * Copyright 2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.config;
-
-import static org.hamcrest.CoreMatchers.*;
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.*;
-
-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;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-/**
- * @author Rizwan Idrees
- * @author Mohsin Husen
- */
-
-@RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration("namespace.xml")
-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()));
-		assertThat(context.getBean(TransportClientFactoryBean.class), is(instanceOf(TransportClientFactoryBean.class)));
-	}
-
-	@Test
-	public void shouldCreateRepository() {
-		assertThat(context.getBean(TransportClientFactoryBean.class), is(notNullValue()));
-		assertThat(context.getBean(SampleElasticsearchRepository.class),
-				is(instanceOf(SampleElasticsearchRepository.class)));
-	}
-}
+/*
+ * Copyright 2013 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.config;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.hamcrest.core.Is.is;
+import static org.junit.Assert.*;
+
+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;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+/**
+ * @author Rizwan Idrees
+ * @author Mohsin Husen
+ */
+
+@RunWith(SpringJUnit4ClassRunner.class)
+@ContextConfiguration("namespace.xml")
+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()));
+		assertThat(context.getBean(TransportClientFactoryBean.class), is(instanceOf(TransportClientFactoryBean.class)));
+	}
+
+	@Test
+	public void shouldCreateRepository() {
+		assertThat(context.getBean(TransportClientFactoryBean.class), is(notNullValue()));
+		assertThat(context.getBean(SampleElasticsearchRepository.class),
+				is(instanceOf(SampleElasticsearchRepository.class)));
+	}
+}

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

@@ -1,96 +1,100 @@
-/*
- * 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.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() {
+			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/core/CustomResultMapper.java

@@ -22,6 +22,7 @@ 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 +48,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

@@ -19,22 +19,35 @@ import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.*;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.RequiredArgsConstructor;
+import lombok.Value;
 
+import java.util.*;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.databind.util.ArrayIterator;
 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.aggregations.Aggregation;
+import org.elasticsearch.search.aggregations.Aggregations;
+import org.elasticsearch.search.aggregations.bucket.terms.Terms;
 import org.elasticsearch.search.internal.InternalSearchHitField;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
+import org.springframework.data.annotation.AccessType;
+import org.springframework.data.annotation.Id;
 import org.springframework.data.domain.Page;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.core.DefaultResultMapperTests.ImmutableEntity;
+import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
+import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
 import org.springframework.data.elasticsearch.entities.Car;
 
 /**
@@ -51,7 +64,33 @@ 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);
+
+		Aggregation aggregationToReturn = createCarAggregation();
+		Aggregations aggregations = mock(Aggregations.class);
+		Iterator<Aggregation> iter = Collections.singletonList(aggregationToReturn).iterator();
+
+		when(aggregations.iterator()).thenReturn(iter).thenReturn(iter);
+		when(aggregations.get("engine")).thenReturn(aggregationToReturn);
+		when(response.getAggregations()).thenReturn(aggregations);
+
+		//When
+		AggregatedPage<Car> page = (AggregatedPage<Car>) resultMapper.mapResults(response, Car.class, null);
+
+		//Then
+		page.hasFacets();
+		assertThat(page.hasAggregations(), is(true));
+		assertThat(page.getAggregation("engine").getName(), is("Diesel"));
 	}
 
 	@Test
@@ -104,6 +143,28 @@ public class DefaultResultMapperTests {
 		assertThat(result.getModel(), is("Grat"));
 		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);
@@ -132,4 +193,12 @@ public class DefaultResultMapperTests {
 		result.put("model", new InternalSearchHitField("model", Arrays.<Object>asList(model)));
 		return result;
 	}
+	
+	@Document(indexName = "someIndex")
+	@NoArgsConstructor(force = true)
+	@Getter
+	static class ImmutableEntity {
+
+		private final String id, name;
+	}
 }