DATAES-581 - Release version 2.1.23 (Ingalls SR23).

Reuse inherited configuration from parent pom.

.gitignore

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

CODE_OF_CONDUCT.adoc

@@ -24,4 +24,4 @@ Instances of abusive, harassing, or otherwise unacceptable behavior may be repor
 All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances.
 Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
 
-This Code of Conduct is adapted from the https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/].
+This Code of Conduct is adapted from the http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/].

Jenkinsfile

@@ -3,7 +3,7 @@ pipeline {
 
 	triggers {
 		pollSCM 'H/10 * * * *'
-		upstream(upstreamProjects: "spring-data-commons/2.1.x", threshold: hudson.model.Result.SUCCESS)
+		upstream(upstreamProjects: "spring-data-commons/1.13.x", threshold: hudson.model.Result.SUCCESS)
 	}
 
 	options {
@@ -15,7 +15,7 @@ pipeline {
 		stage("Test") {
 			when {
 				anyOf {
-					branch '3.1.x'
+					branch '2.1.x'
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
@@ -31,7 +31,7 @@ pipeline {
 					options { timeout(time: 30, unit: 'MINUTES') }
 					steps {
 						sh 'rm -rf ?'
-						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -U -B'
+						sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw clean dependency:list test -Dsort -B'
 					}
 				}
 			}
@@ -61,14 +61,14 @@ pipeline {
 						"-Dartifactory.username=${ARTIFACTORY_USR} " +
 						"-Dartifactory.password=${ARTIFACTORY_PSW} " +
 						"-Dartifactory.staging-repository=libs-snapshot-local " +
-						"-Dartifactory.build-name=spring-data-elasticsearch-3.1 " +
+						"-Dartifactory.build-name=spring-data-elasticsearch-2.1 " +
 						"-Dartifactory.build-number=${BUILD_NUMBER} " +
-						'-Dmaven.test.skip=true clean deploy -U -B'
+						'-Dmaven.test.skip=true clean deploy -B'
 			}
 		}
 		stage('Release to artifactory with docs') {
 			when {
-				branch '3.1.x'
+				branch '2.1.x'
 			}
 			agent {
 				docker {
@@ -90,9 +90,9 @@ pipeline {
 						"-Dartifactory.username=${ARTIFACTORY_USR} " +
 						"-Dartifactory.password=${ARTIFACTORY_PSW} " +
 						"-Dartifactory.staging-repository=libs-snapshot-local " +
-						"-Dartifactory.build-name=spring-data-elasticsearch-3.1 " +
+						"-Dartifactory.build-name=spring-data-elasticsearch-2.1 " +
 						"-Dartifactory.build-number=${BUILD_NUMBER} " +
-						'-Dmaven.test.skip=true clean deploy -U -B'
+						'-Dmaven.test.skip=true clean deploy -B'
 			}
 		}
 	}

README.adoc

@@ -119,7 +119,7 @@ Add the Maven dependency:
 |===
 |Spring Data Elasticsearch | Elasticsearch
 |3.2.x |6.7.2
-|3.1.x |6.2.4
+|3.1.x |6.2.2
 |3.0.x |5.5.0
 |2.1.x |2.4.0
 |2.0.x |2.2.0

pom.xml

@@ -4,12 +4,13 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>3.1.20.RELEASE</version>
+	<version>2.1.23.RELEASE</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.1.20.RELEASE</version>
+		<version>1.9.23.RELEASE</version>
+		<relativePath>../spring-data-build/parent/pom.xml</relativePath>
 	</parent>
 
 	<name>Spring Data Elasticsearch</name>
@@ -17,12 +18,14 @@
 	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
 
 	<properties>
+
+		<dist.key>DATAES</dist.key>
+
 		<commonscollections>3.2.1</commonscollections>
 		<commonslang>2.6</commonslang>
-		<elasticsearch>6.2.4</elasticsearch>
-		<log4j>2.9.1</log4j>
-		<springdata.commons>2.1.20.RELEASE</springdata.commons>
-		<java-module-name>spring.data.elasticsearch</java-module-name>
+		<elasticsearch>2.4.0</elasticsearch>
+		<springdata.commons>1.13.23.RELEASE</springdata.commons>
+
 	</properties>
 
 	<dependencies>
@@ -56,7 +59,6 @@
 			<groupId>commons-lang</groupId>
 			<artifactId>commons-lang</artifactId>
 			<version>${commonslang}</version>
-			<scope>test</scope>
 		</dependency>
 
 		<!-- JODA Time -->
@@ -68,29 +70,9 @@
 
 		<!-- Elasticsearch -->
 		<dependency>
-			<groupId>org.elasticsearch.client</groupId>
-			<artifactId>transport</artifactId>
+			<groupId>org.elasticsearch</groupId>
+			<artifactId>elasticsearch</artifactId>
 			<version>${elasticsearch}</version>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-logging</groupId>
-					<artifactId>commons-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>log4j-over-slf4j</artifactId>
-			<version>${slf4j}</version>
-			<scope>test</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.logging.log4j</groupId>
-			<artifactId>log4j-core</artifactId>
-			<version>${log4j}</version>
-			<scope>test</scope>
 		</dependency>
 
 		<!-- Jackson JSON Mapper -->
@@ -117,18 +99,11 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
 			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>ch.qos.logback</groupId>
-					<artifactId>logback-classic</artifactId>
-				</exclusion>
-			</exclusions>
 		</dependency>
-
 		<dependency>
 			<groupId>org.apache.openwebbeans.test</groupId>
 			<artifactId>cditest-owb</artifactId>
-			<version>1.2.8</version>
+			<version>${webbeans}</version>
 			<scope>test</scope>
 			<exclusions>
 				<exclusion>
@@ -141,15 +116,6 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
-
-		<!-- Upgrade xbean to 4.5 to prevent incompatibilities due to ASM versions -->
-		<dependency>
-			<groupId>org.apache.xbean</groupId>
-			<artifactId>xbean-asm5-shaded</artifactId>
-			<version>4.5</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
@@ -157,14 +123,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<!-- required by elasticsearch -->
-			<groupId>org.elasticsearch.plugin</groupId>
-			<artifactId>transport-netty4-client</artifactId>
-			<version>${elasticsearch}</version>
-			<!--<scope>test</scope>-->
-		</dependency>
-
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
@@ -252,12 +210,12 @@
 
 	<ciManagement>
 		<system>Bamboo</system>
-		<url>https://build.spring.io/browse/SPRINGDATAES</url>
+		<url>https://build.springsource.org/browse/SPRINGDATAES</url>
 	</ciManagement>
 
 	<issueManagement>
 		<system>JIRA</system>
-		<url>https://jira.spring.io/browse/DATAES</url>
+		<url>https://jira.springsource.org/browse/DATAES</url>
 	</issueManagement>
 
 </project>

src/main/asciidoc/preface.adoc

@@ -16,5 +16,5 @@ The Spring Data Elasticsearch project applies core Spring concepts to the develo
 [preface]
 == Requirements
 
-Requires https://www.elastic.co/downloads/elasticsearch[Elasticsearch] 0.20.2 and above or optional dependency or not even that if you are using Embedded Node Client
+Requires http://www.elasticsearch.org/download/[Elasticsearch] 0.20.2 and above or optional dependency or not even that if you are using Embedded Node Client
 

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

@@ -22,9 +22,9 @@ Using the `repositories` element looks up Spring Data repositories as described
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
 xsi:schemaLocation="http://www.springframework.org/schema/beans
-https://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
 http://www.springframework.org/schema/data/elasticsearch
-https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd">
+http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd">
 
     <elasticsearch:repositories base-package="com.acme.repositories" />
     
@@ -43,9 +43,9 @@ Using the `Transport Client` or `Node Client` element registers an instance of `
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
 xsi:schemaLocation="http://www.springframework.org/schema/beans
-https://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
 http://www.springframework.org/schema/data/elasticsearch
-https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd">
+http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd">
 
     <elasticsearch:transport-client id="client" cluster-nodes="localhost:9300,someip:9300" />
     
@@ -62,9 +62,9 @@ https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
 xsi:schemaLocation="http://www.springframework.org/schema/beans
-https://www.springframework.org/schema/beans/spring-beans-3.1.xsd
+http://www.springframework.org/schema/beans/spring-beans-3.1.xsd
 http://www.springframework.org/schema/data/elasticsearch
-https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd">
+http://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-1.0.xsd">
 
     <elasticsearch:node-client id="client" local="true"" />
     

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

@@ -23,55 +23,50 @@ Page<SampleEntity> sampleEntities =
 ----
 ====
 
-[[elasticsearch.scroll]]
-== Using Scroll For Big Result Set
+[[elasticsearch.scan.and.scroll]]
+== Using Scan And Scroll For Big Result Set
 
-Elasticsearch has a scroll API for getting big result set in chunks. `ElasticsearchTemplate` has startScroll and continueScroll methods that can be used as below.
+Elasticsearch has scan and scroll feature for getting big result set in chunks. `ElasticsearchTemplate` has scan and scroll methods that can be used as below.
 
-.Using startScroll and continueScroll
+.Using Scan and Scroll
 ====
 [source,java]
 ----
 SearchQuery searchQuery = new NativeSearchQueryBuilder()
     .withQuery(matchAllQuery())
-    .withIndices(INDEX_NAME)
-    .withTypes(TYPE_NAME)
-    .withFields("message")
-    .withPageable(PageRequest.of(0, 10))
+    .withIndices("test-index")
+    .withTypes("test-type")
+    .withPageable(new PageRequest(0,1))
     .build();
-
-Page<SampleEntity> scroll = elasticsearchTemplate.startScroll(1000, searchQuery, SampleEntity.class);
-
-String scrollId = ((ScrolledPage) scroll).getScrollId();
-List<SampleEntity> sampleEntities = new ArrayList<>();
-while (scroll.hasContent()) {
-    sampleEntities.addAll(scroll.getContent());
-    scrollId = ((ScrolledPage) scroll).getScrollId();
-    scroll = elasticsearchTemplate.continueScroll(scrollId, 1000, SampleEntity.class);
-}
-elasticsearchTemplate.clearScroll(scrollId);
+String scrollId = elasticsearchTemplate.scan(searchQuery,1000,false);
+List<SampleEntity> sampleEntities = new ArrayList<SampleEntity>();
+boolean hasRecords = true;
+while (hasRecords){
+    Page<SampleEntity> page = elasticsearchTemplate.scroll(scrollId, 5000L , new ResultsMapper<SampleEntity>()
+    {
+        @Override
+        public Page<SampleEntity> mapResults(SearchResponse response) {
+            List<SampleEntity> chunk = new ArrayList<SampleEntity>();
+            for(SearchHit searchHit : response.getHits()){
+                if(response.getHits().getHits().length <= 0) {
+                    return null;
+                }
+                SampleEntity user = new SampleEntity();
+                user.setId(searchHit.getId());
+                user.setMessage((String)searchHit.getSource().get("message"));
+                chunk.add(user);
+            }
+            return new PageImpl<SampleEntity>(chunk);
+        }
+    });
+    if(page != null) {
+        sampleEntities.addAll(page.getContent());
+        hasRecords = page.hasNextPage();
+    }
+    else{
+        hasRecords = false;
+    }
+    }
+}            
 ----
 ====
-
-`ElasticsearchTemplate` additionally has the stream method which wraps the scan and scroll operations into a CloseableIterator.
-
-.Using stream
-====
-[source,java]
-----
-SearchQuery searchQuery = new NativeSearchQueryBuilder()
-    .withQuery(matchAllQuery())
-    .withIndices(INDEX_NAME)
-    .withTypes(TYPE_NAME)
-    .withFields("message")
-    .withPageable(PageRequest.of(0, 10))
-    .build();
-
-CloseableIterator<SampleEntity> stream = elasticsearchTemplate.stream(searchQuery, SampleEntity.class);
-
-List<SampleEntity> sampleEntities = new ArrayList<>();
-while (stream.hasNext()) {
-    sampleEntities.add(stream.next());
-}
-----
-====

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

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

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

@@ -1,29 +0,0 @@
-package org.springframework.data.elasticsearch.annotations;
-
-import org.elasticsearch.search.suggest.completion.context.ContextMapping;
-
-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;
-
-/**
- * Based on reference doc - https://www.elastic.co/guide/en/elasticsearch/reference/current/suggester-context.html
- *
- * @author Robert Gruendler
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-@Documented
-@Inherited
-public @interface CompletionContext {
-
-	String name();
-
-	ContextMapping.Type type();
-
-	String precision() default "";
-
-}

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

@@ -1,12 +0,0 @@
-package org.springframework.data.elasticsearch.annotations;
-
-/**
- * Based on reference doc - https://www.elastic.co/guide/en/elasticsearch/reference/current/suggester-context.html
- *
- * @author Robert Gruendler
- */
-public enum CompletionContextType {
-
-	CATEGORY, GEO
-
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,18 +15,12 @@
  */
 package org.springframework.data.elasticsearch.annotations;
 
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
- * Based on the reference doc - https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters-completion.html
+ * Based on the reference doc - http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-suggesters-completion.html
  *
  * @author Mewes Kochheim
- * @author Robert Gruendler
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
@@ -38,11 +32,11 @@ public @interface CompletionField {
 
 	String analyzer() default "simple";
 
+	boolean payloads() default false;
+
 	boolean preserveSeparators() default true;
 
 	boolean preservePositionIncrements() default true;
 
 	int maxInputLength() default 50;
-
-	CompletionContext[] contexts() default {};
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@ package org.springframework.data.elasticsearch.annotations;
 
 /**
  * @author Jakub Vavrik
- *         Values based on reference doc - https://www.elastic.co/guide/reference/mapping/date-format/
+ *         Values based on reference doc - http://www.elasticsearch.org/guide/reference/mapping/date-format/
  */
 public enum DateFormat {
 	none, custom, basic_date, basic_date_time, basic_date_time_no_millis, basic_ordinal_date, basic_ordinal_date_time,

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@ package org.springframework.data.elasticsearch.annotations;
 
 import java.lang.annotation.*;
 
-import org.elasticsearch.index.VersionType;
 import org.springframework.data.annotation.Persistent;
 
 /**
@@ -26,7 +25,6 @@ import org.springframework.data.annotation.Persistent;
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Mason Chan
- * @author Ivan Greene
  */
 
 @Persistent
@@ -50,6 +48,4 @@ public @interface Document {
 	String indexStoreType() default "fs";
 
 	boolean createIndex() default true;
-
-	VersionType versionType() default VersionType.EXTERNAL;
 }

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

@@ -1,27 +0,0 @@
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.data.annotation.Persistent;
-
-/**
- * Elasticsearch dynamic templates mapping.
- * This annotation is handy if you prefer apply dynamic templates on fields with annotation e.g. {@link Field}
- * with type = FieldType.Object etc. instead of static mapping on Document via {@link Mapping} annotation.
- * DynamicTemplates annotation is ommited if {@link Mapping} annotation is used.
- *
- * @author Petr Kukral
- */
-@Persistent
-@Inherited
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ElementType.TYPE})
-public @interface DynamicTemplates {
-
-	String mappingPath() default "";
-
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ public @interface Field {
 
 	FieldType type() default FieldType.Auto;
 
-	boolean index() default true;
+	FieldIndex index() default FieldIndex.analyzed;
 
 	DateFormat format() default DateFormat.none;
 
@@ -46,17 +46,11 @@ public @interface Field {
 
 	boolean store() default false;
 
-	boolean fielddata() default false;
-
 	String searchAnalyzer() default "";
 
 	String analyzer() default "";
 
-	String normalizer() default "";
-
 	String[] ignoreFields() default {};
 
 	boolean includeInParent() default false;
-
-	String[] copyTo() default {};
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2018-2020 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,17 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.elasticsearch.core;
-
-import org.springframework.data.domain.Page;
+package org.springframework.data.elasticsearch.annotations;
 
 /**
- * A score-aware page gaining information about max score.
- * 
- * @param <T>
- * @author Sascha Woo
+ * @author Artur Konczak
+ * @author Mohsin Husen
+ * @author Alexander Volz
+ * @author Dennis Maaß
  */
-public interface ScoredPage<T> extends Page<T> {
-
-	float getMaxScore();
+public enum FieldIndex {
+	not_analyzed, analyzed, no
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,17 +21,5 @@ package org.springframework.data.elasticsearch.annotations;
  * @author Artur Konczak
  */
 public enum FieldType {
-	Text,
-	Integer,
-	Long,
-	Date,
-	Float,
-	Double,
-	Boolean,
-	Object,
-	Auto,
-	Nested,
-	Ip,
-	Attachment,
-	Keyword
+	String, Integer, Long, Date, Float, Double, Boolean, Object, Auto, Nested, Ip, Attachment
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,4 +25,8 @@ import java.lang.annotation.*;
 @Documented
 public @interface GeoPointField {
 
+        boolean geoHashPrefix() default false;
+
+        String geoHashPrecision() default "0";
+
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,9 +21,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 /**
- * @author Artur Konczak
- * @author Mohsin Husen
- * @author Sascha Woo
+ *
  */
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.FIELD)
@@ -33,19 +31,11 @@ public @interface InnerField {
 
 	FieldType type();
 
-	boolean index() default true;
-
-	DateFormat format() default DateFormat.none;
-
-	String pattern() default "";
+	FieldIndex index() default FieldIndex.analyzed;
 
 	boolean store() default false;
 
-	boolean fielddata() default false;
-
 	String searchAnalyzer() default "";
 
-	String analyzer() default "";
-
-	String normalizer() default "";
+	String indexAnalyzer() default "";
 }

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

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

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

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

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

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

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

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

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

@@ -1,23 +0,0 @@
-package org.springframework.data.elasticsearch.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.data.annotation.ReadOnlyProperty;
-
-/**
- * Specifies that this field is used for storing the document score.
- * 
- * @author Sascha Woo
- * @since 3.1
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-@Documented
-@Inherited
-@ReadOnlyProperty
-public @interface Score {}

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

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

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

@@ -1,102 +0,0 @@
-/*
- * Copyright 2018-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.data.elasticsearch.client;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.elasticsearch.common.transport.TransportAddress;
-import org.springframework.data.util.Streamable;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
-
-/**
- * Value object to represent a list of cluster nodes.
- *
- * @author Oliver Gierke
- * @since 3.1
- */
-class ClusterNodes implements Streamable<TransportAddress> {
-
-	public static ClusterNodes DEFAULT = ClusterNodes.of("127.0.0.1:9300");
-
-	private static final String COLON = ":";
-	private static final String COMMA = ",";
-
-	private final List<TransportAddress> clusterNodes;
-
-	/**
-	 * Creates a new {@link ClusterNodes} by parsing the given source.
-	 * 
-	 * @param source must not be {@literal null} or empty.
-	 */
-	private ClusterNodes(String source) {
-
-		Assert.hasText(source, "Cluster nodes source must not be null or empty!");
-
-		String[] nodes = StringUtils.delimitedListToStringArray(source, COMMA);
-
-		this.clusterNodes = Arrays.stream(nodes).map(node -> {
-
-			String[] segments = StringUtils.delimitedListToStringArray(node, COLON);
-
-			Assert.isTrue(segments.length == 2,
-					() -> String.format("Invalid cluster node %s in %s! Must be in the format host:port!", node, source));
-
-			String host = segments[0].trim();
-			String port = segments[1].trim();
-
-			Assert.hasText(host, () -> String.format("No host name given cluster node %s!", node));
-			Assert.hasText(port, () -> String.format("No port given in cluster node %s!", node));
-
-			return new TransportAddress(toInetAddress(host), Integer.valueOf(port));
-
-		}).collect(Collectors.toList());
-	}
-
-	/**
-	 * Creates a new {@link ClusterNodes} by parsing the given source. The expected format is a comma separated list of
-	 * host-port-combinations separated by a colon: {@code host:port,host:port,…}.
-	 * 
-	 * @param source must not be {@literal null} or empty.
-	 * @return
-	 */
-	public static ClusterNodes of(String source) {
-		return new ClusterNodes(source);
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see java.lang.Iterable#iterator()
-	 */
-	@Override
-	public Iterator<TransportAddress> iterator() {
-		return clusterNodes.iterator();
-	}
-
-	private static InetAddress toInetAddress(String host) {
-
-		try {
-			return InetAddress.getByName(host);
-		} catch (UnknownHostException o_O) {
-			throw new IllegalArgumentException(o_O);
-		}
-	}
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2020 the original author or authors.
+ * Copyright 2015-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,34 +15,27 @@
  */
 package org.springframework.data.elasticsearch.client;
 
-import java.io.IOException;
+import static org.elasticsearch.node.NodeBuilder.*;
+
 import java.io.InputStream;
-import java.util.Collection;
+import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.node.NodeClient;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.node.InternalSettingsPreparer;
-import org.elasticsearch.node.Node;
-import org.elasticsearch.plugins.Plugin;
-import org.elasticsearch.transport.Netty4Plugin;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.DisposableBean;
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.util.StringUtils;
-
-import static java.util.Arrays.*;
 
 /**
  * NodeClientFactoryBean
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Ilkang Na
  */
 
-public class NodeClientFactoryBean implements FactoryBean<Client>, InitializingBean, DisposableBean {
+public class NodeClientFactoryBean implements FactoryBean<NodeClient>, InitializingBean, DisposableBean {
 
 	private static final Logger logger = LoggerFactory.getLogger(NodeClientFactoryBean.class);
 	private boolean local;
@@ -53,12 +46,6 @@ public class NodeClientFactoryBean implements FactoryBean<Client>, InitializingB
 	private String pathHome;
 	private String pathConfiguration;
 
-	public static class TestNode extends Node {
-		public TestNode(Settings preparedSettings, Collection<Class<? extends Plugin>> classpathPlugins) {
-			super(InternalSettingsPreparer.prepareEnvironment(preparedSettings, null), classpathPlugins);
-		}
-	}
-
 	NodeClientFactoryBean() {
 	}
 
@@ -83,23 +70,19 @@ public class NodeClientFactoryBean implements FactoryBean<Client>, InitializingB
 
 	@Override
 	public void afterPropertiesSet() throws Exception {
-
-		nodeClient = (NodeClient) new TestNode(
-				Settings.builder().put(loadConfig())
-						.put("transport.type", "netty4")
-						.put("http.type", "netty4")
-						.put("path.home", this.pathHome)
-						.put("path.data", this.pathData)
-						.put("cluster.name", this.clusterName)
-						.put("node.max_local_storage_nodes", 100)
-						.build(), asList(Netty4Plugin.class)).start().client();
+		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() throws IOException {
-		if (!StringUtils.isEmpty(pathConfiguration)) {
+	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), false).build();
+				return Settings.builder().loadFromStream(pathConfiguration, getClass().getClassLoader().getResourceAsStream(pathConfiguration)).build();
 			}
 			logger.error(String.format("Unable to read node configuration from file [%s]", pathConfiguration));
 		}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,20 @@
  */
 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.transport.client.PreBuiltTransportClient;
+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
@@ -33,13 +37,12 @@ import org.springframework.beans.factory.InitializingBean;
  * @author Mohsin Husen
  * @author Jakub Vavrik
  * @author Piotr Betkier
- * @author Ilkang Na
- * @author Oliver Gierke
  */
+
 public class TransportClientFactoryBean implements FactoryBean<TransportClient>, InitializingBean, DisposableBean {
 
 	private static final Logger logger = LoggerFactory.getLogger(TransportClientFactoryBean.class);
-	private ClusterNodes clusterNodes = ClusterNodes.of("127.0.0.1:9300");
+	private String clusterNodes = "127.0.0.1:9300";
 	private String clusterName = "elasticsearch";
 	private Boolean clientTransportSniff = true;
 	private Boolean clientIgnoreClusterName = Boolean.FALSE;
@@ -47,6 +50,8 @@ public class TransportClientFactoryBean implements FactoryBean<TransportClient>,
 	private String clientNodesSamplerInterval = "5s";
 	private TransportClient client;
 	private Properties properties;
+	static final String COLON = ":";
+	static final String COMMA = ",";
 
 	@Override
 	public void destroy() throws Exception {
@@ -81,25 +86,22 @@ public class TransportClientFactoryBean implements FactoryBean<TransportClient>,
 	}
 
 	protected void buildClient() throws Exception {
-
-		client = new PreBuiltTransportClient(settings());
-		
-		clusterNodes.stream() //
-				.peek(it -> logger.info("Adding transport node : " + it.toString())) //
-				.forEach(client::addTransportAddress);
-		
+		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) {
-			Settings.Builder builder = Settings.builder();
-
-			properties.forEach((key, value) -> {
-				builder.put(key.toString(), value.toString());
-			});
-
-			return builder.build();
+			return Settings.builder().put(properties).build();
 		}
 		return Settings.builder()
 				.put("cluster.name", clusterName)
@@ -111,7 +113,7 @@ public class TransportClientFactoryBean implements FactoryBean<TransportClient>,
 	}
 
 	public void setClusterNodes(String clusterNodes) {
-		this.clusterNodes = ClusterNodes.of(clusterNodes);
+		this.clusterNodes = clusterNodes;
 	}
 
 	public void setClusterName(String clusterName) {

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,11 +15,11 @@
  */
 package org.springframework.data.elasticsearch.core;
 
+import static org.apache.commons.lang.StringUtils.*;
+
 import java.io.IOException;
 
 import org.springframework.data.elasticsearch.ElasticsearchException;
-import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
 
 /**
  * @author Artur Konczak
@@ -29,14 +29,11 @@ public abstract class AbstractResultMapper implements ResultsMapper {
 	private EntityMapper entityMapper;
 
 	public AbstractResultMapper(EntityMapper entityMapper) {
-		
-		Assert.notNull(entityMapper, "EntityMapper must not be null!");
-		
 		this.entityMapper = entityMapper;
 	}
 
 	public <T> T mapEntity(String source, Class<T> clazz) {
-		if (StringUtils.isEmpty(source)) {
+		if (isBlank(source)) {
 			return null;
 		}
 		try {

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,142 +16,52 @@
 package org.springframework.data.elasticsearch.core;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 
-import org.springframework.data.annotation.ReadOnlyProperty;
-import org.springframework.data.elasticsearch.core.geo.CustomGeoModule;
-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;
-
-import com.fasterxml.jackson.databind.BeanDescription;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationConfig;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.*;
+import com.fasterxml.jackson.databind.*;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.module.SimpleModule;
-import com.fasterxml.jackson.databind.ser.BeanPropertyWriter;
-import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
+import org.springframework.data.elasticsearch.annotations.Document;
+import org.springframework.data.elasticsearch.core.geo.CustomGeoModule;
+import org.springframework.data.geo.*;
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.core.Version;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+
 
 /**
- * EntityMapper based on a Jackson {@link ObjectMapper}.
+ * DocumentMapper using jackson
  *
  * @author Artur Konczak
  * @author Petar Tahchiev
- * @author Oliver Gierke
  */
 public class DefaultEntityMapper implements EntityMapper {
 
 	private ObjectMapper objectMapper;
 
-	/**
-	 * Creates a new {@link DefaultEntityMapper} using the given {@link MappingContext}.
-	 * 
-	 * @param context must not be {@literal null}.
-	 */
-	public DefaultEntityMapper(
-			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> context) {
-		
-		Assert.notNull(context, "MappingContext must not be null!");
-
+	public DefaultEntityMapper() {
 		objectMapper = new ObjectMapper();
-		
-		objectMapper.registerModule(new SpringDataElasticsearchModule(context));
-		objectMapper.registerModule(new CustomGeoModule());
-		
 		objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 		objectMapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
+		objectMapper.registerModule(new CustomGeoModule());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.core.EntityMapper#mapToString(java.lang.Object)
-	 */
 	@Override
 	public String mapToString(Object object) throws IOException {
 		return objectMapper.writeValueAsString(object);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.core.EntityMapper#mapToObject(java.lang.String, java.lang.Class)
-	 */
 	@Override
 	public <T> T mapToObject(String source, Class<T> clazz) throws IOException {
 		return objectMapper.readValue(source, clazz);
 	}
-
-	/**
-	 * A simple Jackson module to register the {@link SpringDataSerializerModifier}.
-	 *
-	 * @author Oliver Gierke
-	 * @since 3.1
-	 */
-	private static class SpringDataElasticsearchModule extends SimpleModule {
-
-		private static final long serialVersionUID = -9168968092458058966L;
-
-		/**
-		 * Creates a new {@link SpringDataElasticsearchModule} using the given {@link MappingContext}.
-		 * 
-		 * @param context must not be {@literal null}.
-		 */
-		public SpringDataElasticsearchModule(
-				MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> context) {
-
-			Assert.notNull(context, "MappingContext must not be null!");
-			
-			setSerializerModifier(new SpringDataSerializerModifier(context));
-		}
-
-		/**
-		 * A {@link BeanSerializerModifier} that will drop properties annotated with {@link ReadOnlyProperty} for
-		 * serialization.
-		 *
-		 * @author Oliver Gierke
-		 * @since 3.1
-		 */
-		private static class SpringDataSerializerModifier extends BeanSerializerModifier {
-
-			private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> context;
-
-			public SpringDataSerializerModifier(
-					MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> context) {
-
-				Assert.notNull(context, "MappingContext must not be null!");
-
-				this.context = context;
-			}
-
-			/* 
-			 * (non-Javadoc)
-			 * @see com.fasterxml.jackson.databind.ser.BeanSerializerModifier#changeProperties(com.fasterxml.jackson.databind.SerializationConfig, com.fasterxml.jackson.databind.BeanDescription, java.util.List)
-			 */
-			@Override
-			public List<BeanPropertyWriter> changeProperties(SerializationConfig config, BeanDescription description,
-					List<BeanPropertyWriter> properties) {
-
-				Class<?> type = description.getBeanClass();
-				ElasticsearchPersistentEntity<?> entity = context.getPersistentEntity(type);
-
-				if (entity == null) {
-					return super.changeProperties(config, description, properties);
-				}
-
-				List<BeanPropertyWriter> result = new ArrayList<>(properties.size());
-
-				for (BeanPropertyWriter beanPropertyWriter : properties) {
-
-					ElasticsearchPersistentProperty property = entity.getPersistentProperty(beanPropertyWriter.getName());
-
-					if (property != null && property.isWritable()) {
-						result.add(beanPropertyWriter);
-					}
-				}
-
-				return result;
-			}
-		}
-	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
  */
 package org.springframework.data.elasticsearch.core;
 
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -23,12 +24,16 @@ 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 org.elasticsearch.common.document.DocumentField;
 import org.elasticsearch.search.SearchHit;
+import org.elasticsearch.search.SearchHitField;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.elasticsearch.ElasticsearchException;
 import org.springframework.data.elasticsearch.annotations.Document;
@@ -37,84 +42,58 @@ 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.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
+import org.springframework.data.mapping.PersistentProperty;
 import org.springframework.data.mapping.context.MappingContext;
-import org.springframework.util.Assert;
-
-import com.fasterxml.jackson.core.JsonEncoding;
-import com.fasterxml.jackson.core.JsonFactory;
-import com.fasterxml.jackson.core.JsonGenerator;
-import org.springframework.util.StringUtils;
 
 /**
  * @author Artur Konczak
  * @author Petar Tahchiev
  * @author Young Gu
  * @author Oliver Gierke
- * @author Chris White
- * @author Mark Paluch
- * @author Ilkang Na
- * @author Sascha Woo
  */
 public class DefaultResultMapper extends AbstractResultMapper {
 
-	private final MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext;
+	private MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext;
 
 	public DefaultResultMapper() {
-		this(new SimpleElasticsearchMappingContext());
+		super(new DefaultEntityMapper());
 	}
 
 	public DefaultResultMapper(MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext) {
-		
-		super(new DefaultEntityMapper(mappingContext));
-		
-		Assert.notNull(mappingContext, "MappingContext must not be null!");
-		
+		super(new DefaultEntityMapper());
 		this.mappingContext = mappingContext;
 	}
 
 	public DefaultResultMapper(EntityMapper entityMapper) {
-		this(new SimpleElasticsearchMappingContext(), entityMapper);
+		super(entityMapper);
 	}
 
 	public DefaultResultMapper(
 			MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext,
 			EntityMapper entityMapper) {
-		
 		super(entityMapper);
-		
-		Assert.notNull(mappingContext, "MappingContext must not be null!");
-		
 		this.mappingContext = mappingContext;
 	}
 
 	@Override
 	public <T> AggregatedPage<T> mapResults(SearchResponse response, Class<T> clazz, Pageable pageable) {
-		
-		long totalHits = response.getHits().getTotalHits();
-		float maxScore = response.getHits().getMaxScore();
-
-		List<T> results = new ArrayList<>();
+		long totalHits = response.getHits().totalHits();
+		List<T> results = new ArrayList<T>();
 		for (SearchHit hit : response.getHits()) {
 			if (hit != null) {
 				T result = null;
-				if (!StringUtils.isEmpty(hit.getSourceAsString())) {
-					result = mapEntity(hit.getSourceAsString(), clazz);
+				if (StringUtils.isNotBlank(hit.sourceAsString())) {
+					result = mapEntity(hit.sourceAsString(), clazz);
 				} else {
 					result = mapEntity(hit.getFields().values(), clazz);
 				}
-
 				setPersistentEntityId(result, hit.getId(), clazz);
-				setPersistentEntityVersion(result, hit.getVersion(), clazz);
-				setPersistentEntityScore(result, hit.getScore(), clazz);
-				
 				populateScriptFields(result, hit);
 				results.add(result);
 			}
 		}
 
-		return new AggregatedPageImpl<T>(results, pageable, totalHits, response.getAggregations(), response.getScrollId(),
-				maxScore);
+		return new AggregatedPageImpl<T>(results, pageable, totalHits, response.getAggregations());
 	}
 
 	private <T> void populateScriptFields(T result, SearchHit hit) {
@@ -123,14 +102,14 @@ public class DefaultResultMapper extends AbstractResultMapper {
 				ScriptedField scriptedField = field.getAnnotation(ScriptedField.class);
 				if (scriptedField != null) {
 					String name = scriptedField.name().isEmpty() ? field.getName() : scriptedField.name();
-					DocumentField searchHitField = hit.getFields().get(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);
+							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);
 						}
@@ -140,17 +119,18 @@ public class DefaultResultMapper extends AbstractResultMapper {
 		}
 	}
 
-	private <T> T mapEntity(Collection<DocumentField> values, Class<T> clazz) {
+
+	private <T> T mapEntity(Collection<SearchHitField> values, Class<T> clazz) {
 		return mapEntity(buildJSONFromFields(values), clazz);
 	}
 
-	private String buildJSONFromFields(Collection<DocumentField> values) {
+	private String buildJSONFromFields(Collection<SearchHitField> values) {
 		JsonFactory nodeFactory = new JsonFactory();
 		try {
 			ByteArrayOutputStream stream = new ByteArrayOutputStream();
 			JsonGenerator generator = nodeFactory.createGenerator(stream, JsonEncoding.UTF8);
 			generator.writeStartObject();
-			for (DocumentField value : values) {
+			for (SearchHitField value : values) {
 				if (value.getValues().size() > 1) {
 					generator.writeArrayFieldStart(value.getName());
 					for (Object val : value.getValues()) {
@@ -174,19 +154,17 @@ public class DefaultResultMapper extends AbstractResultMapper {
 		T result = mapEntity(response.getSourceAsString(), clazz);
 		if (result != null) {
 			setPersistentEntityId(result, response.getId(), clazz);
-			setPersistentEntityVersion(result, response.getVersion(), clazz);
 		}
 		return result;
 	}
 
 	@Override
 	public <T> LinkedList<T> mapResults(MultiGetResponse responses, Class<T> clazz) {
-		LinkedList<T> list = new LinkedList<>();
+		LinkedList<T> list = new LinkedList<T>();
 		for (MultiGetItemResponse response : responses.getResponses()) {
 			if (!response.isFailed() && response.getResponse().isExists()) {
 				T result = mapEntity(response.getResponse().getSourceAsString(), clazz);
 				setPersistentEntityId(result, response.getResponse().getId(), clazz);
-				setPersistentEntityVersion(result, response.getResponse().getVersion(), clazz);
 				list.add(result);
 			}
 		}
@@ -194,48 +172,16 @@ public class DefaultResultMapper extends AbstractResultMapper {
 	}
 
 	private <T> void setPersistentEntityId(T result, String id, Class<T> clazz) {
-		
-		if (clazz.isAnnotationPresent(Document.class)) {
-			
-			ElasticsearchPersistentEntity<?> persistentEntity = mappingContext.getRequiredPersistentEntity(clazz);
-			ElasticsearchPersistentProperty idProperty = persistentEntity.getIdProperty();
 
+		if (mappingContext != null && clazz.isAnnotationPresent(Document.class)) {
+
+			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)) {
 				persistentEntity.getPropertyAccessor(result).setProperty(idProperty, id);
 			}
 		}
 	}
-
-	private <T> void setPersistentEntityVersion(T result, long version, Class<T> clazz) {
-		
-		if (clazz.isAnnotationPresent(Document.class)) {
-			
-			ElasticsearchPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(clazz);
-			ElasticsearchPersistentProperty versionProperty = persistentEntity.getVersionProperty();
-
-			// Only deal with Long because ES versions are longs !
-			if (versionProperty != null && versionProperty.getType().isAssignableFrom(Long.class)) {
-				// check that a version was actually returned in the response, -1 would indicate that
-				// a search didn't request the version ids in the response, which would be an issue
-				Assert.isTrue(version != -1, "Version in response is -1");
-				persistentEntity.getPropertyAccessor(result).setProperty(versionProperty, version);
-			}
-		}
-	}
-
-	private <T> void setPersistentEntityScore(T result, float score, Class<T> clazz) {
-
-		if (clazz.isAnnotationPresent(Document.class)) {
-
-			ElasticsearchPersistentEntity<?> entity = mappingContext.getRequiredPersistentEntity(clazz);
-
-			if (!entity.hasScoreProperty()) {
-				return;
-			}
-
-			entity.getPropertyAccessor(result) //
-					.setProperty(entity.getScoreProperty(), score);
-		}
-	}
 }

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,8 +19,8 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import org.elasticsearch.search.aggregations.Aggregation;
-import org.elasticsearch.search.aggregations.Aggregations;
 import org.elasticsearch.search.aggregations.bucket.histogram.Histogram;
 import org.elasticsearch.search.aggregations.bucket.range.Range;
 import org.elasticsearch.search.aggregations.bucket.terms.Terms;
@@ -33,14 +33,7 @@ import org.springframework.data.elasticsearch.core.aggregation.AggregatedPage;
 import org.springframework.data.elasticsearch.core.facet.AbstractFacetRequest;
 import org.springframework.data.elasticsearch.core.facet.FacetResult;
 import org.springframework.data.elasticsearch.core.facet.request.RangeFacetRequest;
-import org.springframework.data.elasticsearch.core.facet.result.HistogramResult;
-import org.springframework.data.elasticsearch.core.facet.result.IntervalUnit;
-import org.springframework.data.elasticsearch.core.facet.result.RangeResult;
-import org.springframework.data.elasticsearch.core.facet.result.StatisticalResult;
-import org.springframework.data.elasticsearch.core.facet.result.Term;
-import org.springframework.data.elasticsearch.core.facet.result.TermResult;
-
-import static java.util.Optional.ofNullable;
+import org.springframework.data.elasticsearch.core.facet.result.*;
 
 /**
  * Container for query result and facet results
@@ -49,21 +42,19 @@ import static java.util.Optional.ofNullable;
  * @author Mohsin Husen
  * @author Artur Konczak
  * @author Jonathan Yan
- * @author Philipp Kräutli
- * @author Remco Zigterman
  */
 @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<>();
+	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, ofNullable(pageable).orElse(Pageable.unpaged()), total);
+		super(content, pageable, total);
 	}
 
 	@Override
@@ -93,76 +84,47 @@ public abstract class FacetedPageImpl<T> extends PageImpl<T> implements FacetedP
 	 * Lazy conversion from aggregation to old facets
 	 */
 	private void processAggregations() {
-		if (facets != null) {
-			return;
-		}
-		facets = new ArrayList<>();
-		Aggregations aggregations = getAggregations();
-		if (aggregations == null) {
-			return;
-		}
-		for (Aggregation agg : aggregations) {
-			processAggregation(agg);
-		}
-	}
-
-	private void processAggregation(Aggregation agg)
-	{
-		if (agg instanceof Terms) {
-			processTermAggregation((Terms) agg);
-		}
-		if (agg instanceof Range) {
-			processRangeAggregation((Range) agg);
-		}
-		if (agg instanceof ExtendedStats) {
-			processExtendedStatsAggregation((ExtendedStats) agg);
-		}
-		if (agg instanceof Histogram) {
-			processHistogramAggregation((Histogram) agg);
-		}
-	}
-
-	private void processTermAggregation(Terms agg)
-	{
-		List<Term> terms = new ArrayList<>();
-		for (Terms.Bucket t : agg.getBuckets()) {
-			terms.add(new Term(t.getKeyAsString(), t.getDocCount()));
-		}
-		addFacet(new TermResult(agg.getName(), terms, terms.size(), agg.getSumOfOtherDocCounts(), 0));
-	}
-
-	private void processRangeAggregation(Range agg)
-	{
-		List<? extends Range.Bucket> buckets = ((Range) agg).getBuckets();
-		List<org.springframework.data.elasticsearch.core.facet.result.Range> ranges = new ArrayList<>();
-		for (Range.Bucket b : buckets) {
-			ExtendedStats rStats = b.getAggregations().get(AbstractFacetRequest.INTERNAL_STATS);
-			if (rStats != null) {
-				Sum sum = b.getAggregations().get(RangeFacetRequest.RANGE_INTERNAL_SUM);
-				ranges.add(new org.springframework.data.elasticsearch.core.facet.result.Range((Double) b.getFrom(), (Double) b.getTo(), b.getDocCount(), sum != null ? sum.getValue() : rStats.getSum(), rStats.getCount(), rStats.getMin(), rStats.getMax()));
-			} else {
-				ranges.add(new org.springframework.data.elasticsearch.core.facet.result.Range((Double) b.getFrom(), (Double) b.getTo(), b.getDocCount(), 0, 0, 0, 0));
+		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));
+				}
 			}
 		}
-		addFacet(new RangeResult(agg.getName(), ranges));
-	}
-
-	private void processExtendedStatsAggregation(ExtendedStats agg)
-	{
-		addFacet(new StatisticalResult(agg.getName(), agg.getCount(), agg.getMax(), agg.getMin(), agg.getAvg(), agg.getStdDeviation(), agg.getSumOfSquares(), agg.getSum(), agg.getVariance()));
-	}
-
-	private void processHistogramAggregation(Histogram agg)
-	{
-		List<IntervalUnit> intervals = new ArrayList<>();
-		for (Histogram.Bucket h : agg.getBuckets()) {
-			ExtendedStats hStats = h.getAggregations().get(AbstractFacetRequest.INTERNAL_STATS);
-			if (hStats != null) {
-				intervals.add(new IntervalUnit(((DateTime) h.getKey()).getMillis(), h.getDocCount(), h.getDocCount(), hStats.getSum(), hStats.getAvg(), hStats.getMin(), hStats.getMax()));
-			} else {
-				intervals.add(new IntervalUnit(((DateTime) h.getKey()).getMillis(), h.getDocCount(), h.getDocCount(), 0, 0, 0, 0));
-			}
-		}
-		addFacet(new HistogramResult(agg.getName(), intervals));
 	}
 }

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,40 +15,28 @@
  */
 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.ByteArrayInputStream;
 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.elasticsearch.common.xcontent.XContentType;
-import org.springframework.core.ResolvableType;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.data.annotation.Transient;
-import org.springframework.data.elasticsearch.annotations.CompletionContext;
-import org.springframework.data.elasticsearch.annotations.CompletionField;
-import org.springframework.data.elasticsearch.annotations.DateFormat;
-import org.springframework.data.elasticsearch.annotations.DynamicTemplates;
+import org.springframework.data.elasticsearch.annotations.*;
 import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
-import org.springframework.data.elasticsearch.annotations.GeoPointField;
-import org.springframework.data.elasticsearch.annotations.InnerField;
-import org.springframework.data.elasticsearch.annotations.Mapping;
-import org.springframework.data.elasticsearch.annotations.MultiField;
 import org.springframework.data.elasticsearch.core.completion.Completion;
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 import org.springframework.data.util.ClassTypeInformation;
 import org.springframework.data.util.TypeInformation;
-import org.springframework.util.StringUtils;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 
 /**
  * @author Rizwan Idrees
@@ -58,50 +46,37 @@ import com.fasterxml.jackson.databind.ObjectMapper;
  * @author Alexander Volz
  * @author Dennis Maaß
  * @author Pavel Luhin
- * @author Mark Paluch
- * @author Sascha Woo
- * @author Nordine Bittich
- * @author Robert Gruendler
- * @author Petr Kukral
+ * @author Oliver Gierke
  */
+
 class MappingBuilder {
 
-	public static final String FIELD_DATA = "fielddata";
 	public static final String FIELD_STORE = "store";
 	public static final String FIELD_TYPE = "type";
 	public static final String FIELD_INDEX = "index";
 	public static final String FIELD_FORMAT = "format";
 	public static final String FIELD_SEARCH_ANALYZER = "search_analyzer";
 	public static final String FIELD_INDEX_ANALYZER = "analyzer";
-	public static final String FIELD_NORMALIZER = "normalizer";
 	public static final String FIELD_PROPERTIES = "properties";
 	public static final String FIELD_PARENT = "_parent";
-	public static final String FIELD_COPY_TO = "copy_to";
-	public static final String FIELD_CONTEXT_NAME = "name";
-	public static final String FIELD_CONTEXT_TYPE = "type";
-	public static final String FIELD_CONTEXT_PRECISION = "precision";
-	public static final String FIELD_DYNAMIC_TEMPLATES = "dynamic_templates";
 
+	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 COMPLETION_CONTEXTS = "contexts";
 
-	public static final String TYPE_VALUE_KEYWORD = "keyword";
+	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 = SimpleTypeHolder.DEFAULT;
+	private static SimpleTypeHolder SIMPLE_TYPE_HOLDER = new SimpleTypeHolder();
 
-	static XContentBuilder buildMapping(Class<?> clazz, String indexType, String idFieldName, String parentType) throws IOException {
+	static XContentBuilder buildMapping(Class clazz, String indexType, String idFieldName, String parentType) throws IOException {
 
 		XContentBuilder mapping = jsonBuilder().startObject().startObject(indexType);
-
-		// Dynamic templates
-		addDynamicTemplatesMapping(mapping, clazz);
-
 		// Parent
 		if (hasText(parentType)) {
 			mapping.startObject(FIELD_PARENT).field(FIELD_TYPE, parentType).endObject();
@@ -110,12 +85,12 @@ class MappingBuilder {
 		// Properties
 		XContentBuilder xContentBuilder = mapping.startObject(FIELD_PROPERTIES);
 
-		mapEntity(xContentBuilder, clazz, true, idFieldName, "", false, FieldType.Auto, null);
+		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,
+	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);
@@ -141,10 +116,10 @@ class MappingBuilder {
 
 			if (field.isAnnotationPresent(Mapping.class)) {
 				String mappingPath = field.getAnnotation(Mapping.class).mappingPath();
-				if (!StringUtils.isEmpty(mappingPath)) {
+				if (isNotBlank(mappingPath)) {
 					ClassPathResource mappings = new ClassPathResource(mappingPath);
 					if (mappings.exists()) {
-						xContentBuilder.rawField(field.getName(), mappings.getInputStream(), XContentType.JSON);
+						xContentBuilder.rawField(field.getName(), mappings.getInputStream());
 						continue;
 					}
 				}
@@ -159,7 +134,7 @@ class MappingBuilder {
 					continue;
 				}
 				boolean nestedOrObject = isNestedOrObjectField(field);
-				mapEntity(xContentBuilder, getFieldType(field), false, "", field.getName(), nestedOrObject, singleField.type(), field.getAnnotation(Field.class));
+				mapEntity(xContentBuilder, getFieldType(field), false, EMPTY, field.getName(), nestedOrObject, singleField.type(), field.getAnnotation(Field.class));
 				if (nestedOrObject) {
 					continue;
 				}
@@ -190,12 +165,12 @@ class MappingBuilder {
 		}
 	}
 
-	private static java.lang.reflect.Field[] retrieveFields(Class<?> clazz) {
+	private static java.lang.reflect.Field[] retrieveFields(Class clazz) {
 		// Create list of fields.
-		List<java.lang.reflect.Field> fields = new ArrayList<>();
+		List<java.lang.reflect.Field> fields = new ArrayList<java.lang.reflect.Field>();
 
 		// Keep backing up the inheritance hierarchy.
-		Class<?> targetClass = clazz;
+		Class targetClass = clazz;
 		do {
 			fields.addAll(Arrays.asList(targetClass.getDeclaredFields()));
 			targetClass = targetClass.getSuperclass();
@@ -215,6 +190,21 @@ class MappingBuilder {
 	private static void applyGeoPointFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field) throws IOException {
 		xContentBuilder.startObject(field.getName());
 		xContentBuilder.field(FIELD_TYPE, TYPE_VALUE_GEO_POINT);
+
+		GeoPointField annotation = field.getAnnotation(GeoPointField.class);
+		if (annotation != null) {
+			if (annotation.geoHashPrefix()) {
+				xContentBuilder.field(TYPE_VALUE_GEO_HASH_PREFIX, true);
+				if (StringUtils.isNotEmpty(annotation.geoHashPrecision())) {
+					if (NumberUtils.isNumber(annotation.geoHashPrecision())) {
+						xContentBuilder.field(TYPE_VALUE_GEO_HASH_PRECISION, Integer.parseInt(annotation.geoHashPrecision()));
+					} else {
+						xContentBuilder.field(TYPE_VALUE_GEO_HASH_PRECISION, annotation.geoHashPrecision());
+					}
+				}
+			}
+		}
+
 		xContentBuilder.endObject();
 	}
 
@@ -223,28 +213,15 @@ class MappingBuilder {
 		xContentBuilder.field(FIELD_TYPE, TYPE_VALUE_COMPLETION);
 		if (annotation != null) {
 			xContentBuilder.field(COMPLETION_MAX_INPUT_LENGTH, annotation.maxInputLength());
+			xContentBuilder.field(COMPLETION_PAYLOADS, annotation.payloads());
 			xContentBuilder.field(COMPLETION_PRESERVE_POSITION_INCREMENTS, annotation.preservePositionIncrements());
 			xContentBuilder.field(COMPLETION_PRESERVE_SEPARATORS, annotation.preserveSeparators());
-			if (!StringUtils.isEmpty(annotation.searchAnalyzer())) {
+			if (isNotBlank(annotation.searchAnalyzer())) {
 				xContentBuilder.field(FIELD_SEARCH_ANALYZER, annotation.searchAnalyzer());
 			}
-			if (!StringUtils.isEmpty(annotation.analyzer())) {
+			if (isNotBlank(annotation.analyzer())) {
 				xContentBuilder.field(FIELD_INDEX_ANALYZER, annotation.analyzer());
 			}
-			if (annotation.contexts().length > 0) {
-				xContentBuilder.startArray(COMPLETION_CONTEXTS);
-				for (CompletionContext context : annotation.contexts()) {
-					xContentBuilder.startObject();
-					xContentBuilder.field(FIELD_CONTEXT_NAME, context.name());
-					xContentBuilder.field(FIELD_CONTEXT_TYPE, context.type().name().toLowerCase());
-					if (context.precision().length() > 0) {
-						xContentBuilder.field(FIELD_CONTEXT_PRECISION, context.precision());
-					}
-					xContentBuilder.endObject();
-				}
-				xContentBuilder.endArray();
-			}
-
 		}
 		xContentBuilder.endObject();
 	}
@@ -252,164 +229,98 @@ class MappingBuilder {
 	private static void applyDefaultIdFieldMapping(XContentBuilder xContentBuilder, java.lang.reflect.Field field)
 			throws IOException {
 		xContentBuilder.startObject(field.getName())
-				.field(FIELD_TYPE, TYPE_VALUE_KEYWORD)
-				.field(FIELD_INDEX, true);
+				.field(FIELD_TYPE, TYPE_VALUE_STRING)
+				.field(FIELD_INDEX, INDEX_VALUE_NOT_ANALYZED);
 		xContentBuilder.endObject();
 	}
 
 	/**
-	 * Add mapping for @Field annotation
+	 * Apply mapping for a single @Field annotation
 	 *
 	 * @throws IOException
 	 */
-	private static void addSingleFieldMapping(XContentBuilder builder, java.lang.reflect.Field field, Field annotation, boolean nestedOrObjectField) throws IOException {
-		builder.startObject(field.getName());
-		addFieldMappingParameters(builder, annotation, nestedOrObjectField);
+	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();
 	}
 
 	/**
-	 * Add mapping for @MultiField annotation
+	 * 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 {
-
-		// main field
+	private static void addMultiFieldMapping(XContentBuilder builder, java.lang.reflect.Field field,
+											 MultiField annotation, boolean nestedOrObjectField) throws IOException {
 		builder.startObject(field.getName());
-		addFieldMappingParameters(builder, annotation.mainField(), nestedOrObjectField);
-
-		// inner fields
+		builder.field(FIELD_TYPE, "multi_field");
 		builder.startObject("fields");
+		//add standard field
+		addSingleFieldMapping(builder, field, annotation.mainField(),nestedOrObjectField);
 		for (InnerField innerField : annotation.otherFields()) {
-			builder.startObject(innerField.suffix());
-			addFieldMappingParameters(builder, innerField, false);
-			builder.endObject();
+			addNestedFieldMapping(builder, field, innerField);
 		}
 		builder.endObject();
-
 		builder.endObject();
 	}
 
-	private static void addFieldMappingParameters(XContentBuilder builder, Object annotation, boolean nestedOrObjectField) throws IOException {
-		boolean index = true;
-		boolean store = false;
-		boolean fielddata = false;
-		FieldType type = null;
-		DateFormat dateFormat = null;
-		String datePattern = null;
-		String analyzer = null;
-		String searchAnalyzer = null;
-		String normalizer = null;
-		String[] copyTo = null;
-
-		if (annotation instanceof Field) {
-			// @Field
-			Field fieldAnnotation = (Field) annotation;
-			index = fieldAnnotation.index();
-			store = fieldAnnotation.store();
-			fielddata = fieldAnnotation.fielddata();
-			type = fieldAnnotation.type();
-			dateFormat = fieldAnnotation.format();
-			datePattern = fieldAnnotation.pattern();
-			analyzer = fieldAnnotation.analyzer();
-			searchAnalyzer = fieldAnnotation.searchAnalyzer();
-			normalizer = fieldAnnotation.normalizer();
-			copyTo = fieldAnnotation.copyTo();
-		} else if (annotation instanceof InnerField) {
-			// @InnerField
-			InnerField fieldAnnotation = (InnerField) annotation;
-			index = fieldAnnotation.index();
-			store = fieldAnnotation.store();
-			fielddata = fieldAnnotation.fielddata();
-			type = fieldAnnotation.type();
-			dateFormat = fieldAnnotation.format();
-			datePattern = fieldAnnotation.pattern();
-			analyzer = fieldAnnotation.analyzer();
-			searchAnalyzer = fieldAnnotation.searchAnalyzer();
-			normalizer = fieldAnnotation.normalizer();
-		} else {
-			throw new IllegalArgumentException("annotation must be an instance of @Field or @InnerField");
-		}
-
-		if (!nestedOrObjectField) {
-			builder.field(FIELD_STORE, store);
-		}
-		if (fielddata) {
-			builder.field(FIELD_DATA, fielddata);
-		}
-		if (type != FieldType.Auto) {
-			builder.field(FIELD_TYPE, type.name().toLowerCase());
-
-			if (type == FieldType.Date && dateFormat != DateFormat.none) {
-				builder.field(FIELD_FORMAT, dateFormat == DateFormat.custom ? datePattern : dateFormat.toString());
-			}
-		}
-		if (!index) {
-			builder.field(FIELD_INDEX, index);
-		}
-		if (!StringUtils.isEmpty(analyzer)) {
-			builder.field(FIELD_INDEX_ANALYZER, analyzer);
-		}
-		if (!StringUtils.isEmpty(searchAnalyzer)) {
-			builder.field(FIELD_SEARCH_ANALYZER, searchAnalyzer);
-		}
-		if (!StringUtils.isEmpty(normalizer)) {
-			builder.field(FIELD_NORMALIZER, normalizer);
-		}
-		if (copyTo != null && copyTo.length > 0) {
-			builder.field(FIELD_COPY_TO, copyTo);
-		}
-	}
-
-	/**
-	 * Apply mapping for dynamic templates.
-	 *
-	 * @throws IOException
-	 */
-	private static void addDynamicTemplatesMapping(XContentBuilder builder, Class<?> clazz) throws IOException {
-		if (clazz.isAnnotationPresent(DynamicTemplates.class)){
-			String mappingPath = ((DynamicTemplates) clazz.getAnnotation(DynamicTemplates.class)).mappingPath();
-			if (hasText(mappingPath)) {
-				String jsonString = ElasticsearchTemplate.readFileFromClasspath(mappingPath);
-				if (hasText(jsonString)) {
-					ObjectMapper objectMapper = new ObjectMapper();
-					JsonNode jsonNode = objectMapper.readTree(jsonString).get("dynamic_templates");
-					if (jsonNode != null && jsonNode.isArray()){
-						String json = objectMapper.writeValueAsString(jsonNode);
-						builder.rawField(FIELD_DYNAMIC_TEMPLATES, new ByteArrayInputStream(json.getBytes()), XContentType.JSON);
-					}
-				}
-			}
-		}
-	}
-
 	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());
+		return isComplexType && !typeInformation.isMap();
 	}
 
 	protected static Class<?> getFieldType(java.lang.reflect.Field field) {
-
-		ResolvableType resolvableType = ResolvableType.forField(field);
-
-		if (resolvableType.isArray()) {
-			return resolvableType.getComponentType().getRawClass();
-		}
-
-		ResolvableType componentType = resolvableType.getGeneric(0);
-		if (Iterable.class.isAssignableFrom(field.getType())
-				&& componentType != ResolvableType.NONE) {
-			return componentType.getRawClass();
-		}
-
-		return resolvableType.getRawClass();
+		
+		return ClassTypeInformation.from(field.getDeclaringClass()) //
+				.getProperty(field.getName()) //
+				.getActualType() //
+				.getType();
 	}
 
 	private static boolean isAnyPropertyAnnotatedAsField(java.lang.reflect.Field[] fields) {

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

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

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

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

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

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

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

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

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

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

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

@@ -3,14 +3,11 @@ package org.springframework.data.elasticsearch.core.aggregation;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.elasticsearch.search.aggregations.Aggregations;
 import org.springframework.data.elasticsearch.core.FacetedPage;
-import org.springframework.data.elasticsearch.core.ScoredPage;
-import org.springframework.data.elasticsearch.core.ScrolledPage;
 
 /**
  * @author Petar Tahchiev
- * @author Sascha Woo
  */
-public interface AggregatedPage<T> extends FacetedPage<T>, ScrolledPage<T>, ScoredPage<T> {
+public interface AggregatedPage<T> extends FacetedPage<T> {
 
 	boolean hasAggregations();
 

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

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

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

@@ -2,25 +2,21 @@ package org.springframework.data.elasticsearch.core.completion;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import java.util.List;
-import java.util.Map;
-
 /**
- * Based on the reference doc -
- * https://www.elastic.co/guide/en/elasticsearch/reference/current/search-suggesters-completion.html
+ * Based on the reference doc - http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/search-suggesters-completion.html
  *
  * @author Mewes Kochheim
- * @author Robert Gruendler
  */
 @JsonInclude(value = JsonInclude.Include.NON_NULL)
 public class Completion {
 
 	private String[] input;
-	private Map<String, List<String>> contexts;
+	private String output;
 	private Integer weight;
+	private Object payload;
 
 	private Completion() {
-		// required by mapper to instantiate object
+		//required by mapper to instantiate object
 	}
 
 	public Completion(String[] input) {
@@ -35,6 +31,22 @@ public class Completion {
 		this.input = input;
 	}
 
+	public String getOutput() {
+		return output;
+	}
+
+	public void setOutput(String output) {
+		this.output = output;
+	}
+
+	public Object getPayload() {
+		return payload;
+	}
+
+	public void setPayload(Object payload) {
+		this.payload = payload;
+	}
+
 	public Integer getWeight() {
 		return weight;
 	}
@@ -42,13 +54,4 @@ public class Completion {
 	public void setWeight(Integer weight) {
 		this.weight = weight;
 	}
-
-	public Map<String, List<String>> getContexts() {
-		return contexts;
-	}
-
-	public void setContexts(Map<String, List<String>> contexts) {
-		this.contexts = contexts;
-	}
-
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,13 +16,14 @@
 
 package org.springframework.data.elasticsearch.core.facet.request;
 
+import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramBuilder;
 import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
 import org.springframework.data.elasticsearch.core.facet.AbstractFacetRequest;
 import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
+
 
 /**
  * @author Artur Konczak
@@ -53,19 +54,19 @@ public class HistogramFacetRequest extends AbstractFacetRequest {
 
 	public AbstractAggregationBuilder getFacet() {
 		Assert.notNull(getName(), "Facet name can't be a null !!!");
-		Assert.isTrue(!StringUtils.isEmpty(field), "Please select field on which to build the facet !!!");
+		Assert.isTrue(StringUtils.isNotBlank(field), "Please select field on which to build the facet !!!");
 		Assert.isTrue(interval > 0, "Please provide interval as positive value greater them zero !!!");
 
-		DateHistogramAggregationBuilder dateHistogramBuilder = AggregationBuilders.dateHistogram(getName());
+		DateHistogramBuilder dateHistogramBuilder = AggregationBuilders.dateHistogram(getName());
 		dateHistogramBuilder.field(field);
 
 		if (timeUnit != null) {
-			dateHistogramBuilder.dateHistogramInterval(timeUnit);
+			dateHistogramBuilder.interval(timeUnit);
 		} else {
 			dateHistogramBuilder.interval(interval);
 		}
 
-		dateHistogramBuilder.subAggregation(AggregationBuilders.extendedStats(INTERNAL_STATS).field(field));
+		dateHistogramBuilder.subAggregation(AggregationBuilders.extendedStats(INTERNAL_STATS));
 
 		return dateHistogramBuilder;
 	}

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,12 +19,13 @@ package org.springframework.data.elasticsearch.core.facet.request;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
 import org.elasticsearch.search.aggregations.AggregationBuilders;
-import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
+import org.elasticsearch.search.aggregations.bucket.range.RangeBuilder;
 import org.springframework.data.elasticsearch.core.facet.AbstractFacetRequest;
 import org.springframework.util.Assert;
-import org.springframework.util.StringUtils;
+
 
 /**
  * Range facet for numeric fields
@@ -40,7 +41,7 @@ public class RangeFacetRequest extends AbstractFacetRequest {
 	private String keyField;
 	private String valueField;
 
-	private List<Entry> entries = new ArrayList<>();
+	private List<Entry> entries = new ArrayList<Entry>();
 
 	public RangeFacetRequest(String name) {
 		super(name);
@@ -75,17 +76,16 @@ public class RangeFacetRequest extends AbstractFacetRequest {
 	public AbstractAggregationBuilder getFacet() {
 		Assert.notNull(getName(), "Facet name can't be a null !!!");
 
-		RangeAggregationBuilder rangeBuilder = AggregationBuilders.range(getName());
-		final String field = !StringUtils.isEmpty(keyField) ? keyField : this.field;
-		rangeBuilder.field(field);
+		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).field(field));
-		if(!StringUtils.isEmpty(valueField)){
+		rangeBuilder.subAggregation(AggregationBuilders.extendedStats(INTERNAL_STATS));
+		if(StringUtils.isNotBlank(valueField)){
 			rangeBuilder.subAggregation(AggregationBuilders.sum(RANGE_INTERNAL_SUM).field(valueField));
 		}
 

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,11 +16,12 @@
 
 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;
-import org.springframework.util.StringUtils;
+
 
 /**
  * @author Petar Tahchiev
@@ -46,7 +47,7 @@ public class StatisticalFacetRequest extends AbstractFacetRequest {
 
 	public AbstractAggregationBuilder getFacet() {
 		Assert.notNull(getName(), "Facet name can't be a null !!!");
-		Assert.isTrue(!StringUtils.isEmpty(field) && fields == null, "Please select field or fields on which to build the facets !!!");
+		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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2020 the original author or authors.
+ * Copyright 2014-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,22 +16,20 @@
 
 package org.springframework.data.elasticsearch.core.facet.request;
 
-import org.apache.lucene.util.automaton.RegExp;
+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.BucketOrder;
-import org.elasticsearch.search.aggregations.bucket.terms.IncludeExclude;
-import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
+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;
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
+
 
 /**
  * Term facet
  *
  * @author Artur Konczak
- * @author Ilkang Na
  */
 @Deprecated
 public class TermFacetRequest extends AbstractFacetRequest {
@@ -48,8 +46,8 @@ public class TermFacetRequest extends AbstractFacetRequest {
 	}
 
 	public void setFields(String... fields) {
-		Assert.isTrue(!ObjectUtils.isEmpty(fields), "Term agg need one field only");
-		Assert.isTrue(fields.length == 1, "Term agg need one field only");
+		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;
 	}
 
@@ -77,31 +75,31 @@ public class TermFacetRequest extends AbstractFacetRequest {
 	@Override
 	public AbstractAggregationBuilder getFacet() {
 		Assert.notEmpty(fields, "Please select at last one field !!!");
-		final TermsAggregationBuilder termsBuilder = AggregationBuilders.terms(getName()).field(fields[0]).size(this.size);
+		TermsBuilder termsBuilder = AggregationBuilders.terms(getName()).field(fields[0]).size(this.size);
 
 		switch (order) {
 			case descTerm:
-				termsBuilder.order(BucketOrder.key(false));
+				termsBuilder.order(Terms.Order.term(false));
 				break;
 			case ascTerm:
-				termsBuilder.order(BucketOrder.key(true));
+				termsBuilder.order(Terms.Order.term(true));
 				break;
 			case descCount:
-				termsBuilder.order(BucketOrder.count(false));
+				termsBuilder.order(Terms.Order.count(false));
 				break;
 			default:
-				termsBuilder.order(BucketOrder.count(true));
+				termsBuilder.order(Terms.Order.count(true));
 		}
-		if (!ObjectUtils.isEmpty(excludeTerms)) {
-			termsBuilder.includeExclude(new IncludeExclude(null, excludeTerms));
+		if (ArrayUtils.isNotEmpty(excludeTerms)) {
+			termsBuilder.exclude(excludeTerms);
 		}
 
 		if (allTerms) {
 			termsBuilder.size(Integer.MAX_VALUE);
 		}
 
-		if (!StringUtils.isEmpty(regex)) {
-			termsBuilder.includeExclude(new IncludeExclude(new RegExp(regex), null));
+		if (StringUtils.isNotBlank(regex)) {
+			termsBuilder.include(regex);
 		}
 
 		return termsBuilder;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,8 +1,10 @@
 package org.springframework.data.elasticsearch.core.geo;
 
 import java.io.IOException;
+
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.Version;
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
@@ -30,15 +32,39 @@ public class CustomGeoModule extends SimpleModule {
 }
 
 class PointSerializer extends JsonSerializer<Point> {
+
 	@Override
-	public void serialize(Point value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
+	public void serialize(Point value, JsonGenerator gen, SerializerProvider serializers) throws IOException, JsonProcessingException {
 		gen.writeObject(GeoPoint.fromPoint(value));
+//		gen.writeStartObject();
+//		gen.writeNumberField("lat", value.getY());
+//		gen.writeNumberField("lon", value.getX());
+//		gen.writeEndObject();
 	}
 }
 
 class PointDeserializer extends JsonDeserializer<Point> {
+
 	@Override
-	public Point deserialize(JsonParser p, DeserializationContext context) throws IOException {
-		return GeoPoint.toPoint(p.readValueAs(GeoPoint.class));
+	public Point deserialize(JsonParser p, DeserializationContext context) throws IOException, JsonProcessingException {
+
+		GeoPoint point = p.readValueAs(GeoPoint.class);
+//		Double lat = null;
+//		Double lon = null;
+//		//skipp field name
+//		p.nextFieldName();
+//		if ("lat".equals(p.getCurrentName())) {
+//			//get value
+//			p.nextFieldName();
+//			lat = p.getDoubleValue();
+//			p.nextFieldName();
+//		}
+//		if ("lon".equals(p.getCurrentName())) {
+//			//get value
+//			p.nextFieldName();
+//			lon = p.getDoubleValue();
+//		}
+//		return new Point(lon, lat);
+		return GeoPoint.toPoint(point);
 	}
 }

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,20 +15,15 @@
  */
 package org.springframework.data.elasticsearch.core.mapping;
 
-import org.elasticsearch.index.VersionType;
 import org.springframework.data.mapping.PersistentEntity;
-import org.springframework.lang.Nullable;
 
 /**
  * ElasticsearchPersistentEntity
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Mark Paluch
- * @author Sascha Woo
- * @author Oliver Gierke
- * @author Ivan Greene
  */
+
 public interface ElasticsearchPersistentEntity<T> extends PersistentEntity<T, ElasticsearchPersistentProperty> {
 
 	String getIndexName();
@@ -53,27 +48,5 @@ public interface ElasticsearchPersistentEntity<T> extends PersistentEntity<T, El
 
 	String settingPath();
 
-	VersionType getVersionType();
-
 	boolean isCreateIndexAndMapping();
-
-	/**
-	 * Returns whether the {@link ElasticsearchPersistentEntity} has an score property. If this call returns
-	 * {@literal true}, {@link #getScoreProperty()} will return a non-{@literal null} value.
-	 *
-	 * @return false when {@link ElasticsearchPersistentEntity} does not define a score property.
-	 * @since 3.1
-	 */
-	boolean hasScoreProperty();
-
-	/**
-	 * Returns the score property of the {@link ElasticsearchPersistentEntity}. Can be {@literal null} in case no score
-	 * property is available on the entity.
-	 *
-	 * @return the score {@link ElasticsearchPersistentProperty} of the {@link PersistentEntity} or {@literal null} if not
-	 *         defined.
-	 * @since 3.1
-	 */
-	@Nullable
-	ElasticsearchPersistentProperty getScoreProperty();
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,37 +23,12 @@ import org.springframework.data.mapping.PersistentProperty;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Sascha Woo
- * @author Oliver Gierke
  */
+
 public interface ElasticsearchPersistentProperty extends PersistentProperty<ElasticsearchPersistentProperty> {
 
 	String getFieldName();
 
-	/**
-	 * Returns whether the current property is a <em>potential</em> score property of the owning
-	 * {@link ElasticsearchPersistentEntity}. This method is mainly used by {@link ElasticsearchPersistentEntity}
-	 * implementation to discover score property candidates on {@link ElasticsearchPersistentEntity} creation you should
-	 * rather call {@link ElasticsearchPersistentEntity#isScoreProperty(PersistentProperty)} to determine whether the
-	 * current property is the score property of that {@link ElasticsearchPersistentEntity} under consideration.
-	 *
-	 * @return
-	 * @since 3.1
-	 */
-	boolean isScoreProperty();
-
-	/**
-	 * Returns whether the current property is a <em>potential</em> parent property of the owning
-	 * {@link ElasticsearchPersistentEntity}. This method is mainly used by {@link ElasticsearchPersistentEntity}
-	 * implementation to discover parent property candidates on {@link ElasticsearchPersistentEntity} creation you should
-	 * rather call {@link ElasticsearchPersistentEntity#isParentProperty()} to determine whether the current property is
-	 * the parent property of that {@link ElasticsearchPersistentEntity} under consideration.
-	 *
-	 * @return
-	 * @since 3.1
-	 */
-	boolean isParentProperty();
-
 	public enum PropertyToFieldNameConverter implements Converter<ElasticsearchPersistentProperty, String> {
 
 		INSTANCE;

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,7 +19,6 @@ import static org.springframework.util.StringUtils.*;
 
 import java.util.Locale;
 
-import org.elasticsearch.index.VersionType;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
@@ -28,15 +27,12 @@ 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.MappingException;
 import org.springframework.data.mapping.model.BasicPersistentEntity;
-import org.springframework.data.mapping.model.PersistentPropertyAccessorFactory;
 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.lang.Nullable;
 import org.springframework.util.Assert;
 
 /**
@@ -45,9 +41,6 @@ import org.springframework.util.Assert;
  * @param <T>
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Mark Paluch
- * @author Sascha Woo
- * @author Ivan Greene
  */
 public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntity<T, ElasticsearchPersistentProperty>
 		implements ElasticsearchPersistentEntity<T>, ApplicationContextAware {
@@ -64,9 +57,7 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit
 	private String indexStoreType;
 	private String parentType;
 	private ElasticsearchPersistentProperty parentIdProperty;
-	private ElasticsearchPersistentProperty scoreProperty;
 	private String settingPath;
-	private VersionType versionType;
 	private boolean createIndexAndMapping;
 
 	public SimpleElasticsearchPersistentEntity(TypeInformation<T> typeInformation) {
@@ -86,7 +77,6 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit
 			this.replicas = document.replicas();
 			this.refreshInterval = document.refreshInterval();
 			this.indexStoreType = document.indexStoreType();
-			this.versionType = document.versionType();
 			this.createIndexAndMapping = document.createIndex();
 		}
 		if (clazz.isAnnotationPresent(Setting.class)) {
@@ -148,11 +138,6 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit
 		return parentIdProperty;
 	}
 
-	@Override
-	public VersionType getVersionType() {
-		return versionType;
-	}
-
 	@Override
 	public String settingPath() {
 		return settingPath;
@@ -163,58 +148,23 @@ public class SimpleElasticsearchPersistentEntity<T> extends BasicPersistentEntit
 		return createIndexAndMapping;
 	}
 
-	@Override
-	public boolean hasScoreProperty() {
-		return scoreProperty != null;
-	}
-
-	@Nullable
-	@Override
-	public ElasticsearchPersistentProperty getScoreProperty() {
-		return scoreProperty;
-	}
-
 	@Override
 	public void addPersistentProperty(ElasticsearchPersistentProperty property) {
 		super.addPersistentProperty(property);
 
-		if (property.isParentProperty()) {
-			ElasticsearchPersistentProperty parentProperty = this.parentIdProperty;
-
-			if (parentProperty != null) {
-				throw new MappingException(
-						String.format("Attempt to add parent property %s but already have property %s registered "
-								+ "as parent property. Check your mapping configuration!", property.getField(), parentProperty.getField()));
+		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();
 			}
-
-			Parent parentAnnotation = property.findAnnotation(Parent.class);
-			this.parentIdProperty = property;
-			this.parentType = parentAnnotation.type();
 		}
 
-		if (property.isScoreProperty()) {
-			
-			ElasticsearchPersistentProperty scoreProperty = this.scoreProperty;
-
-			if (scoreProperty != null) {
-				throw new MappingException(
-						String.format("Attempt to add score property %s but already have property %s registered "
-								+ "as score property. Check your mapping configuration!", property.getField(), scoreProperty.getField()));
-			}
-
-			this.scoreProperty = property;
+		if (property.isVersionProperty()) {
+			Assert.isTrue(property.getType() == Long.class, "Version property should be Long");
 		}
 	}
-	
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.model.BasicPersistentEntity#setPersistentPropertyAccessorFactory(org.springframework.data.mapping.model.PersistentPropertyAccessorFactory)
-	 */
-	@Override
-	public void setPersistentPropertyAccessorFactory(PersistentPropertyAccessorFactory factory) {
-		
-		// Do nothing to avoid the usage of ClassGeneratingPropertyAccessorFactory for now
-		// DATACMNS-1322 switches to proper immutability behavior which Spring Data Elasticsearch
-		// cannot yet implement
-	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,16 +15,14 @@
  */
 package org.springframework.data.elasticsearch.core.mapping;
 
-import java.util.Arrays;
-import java.util.List;
+import java.beans.PropertyDescriptor;
+import java.lang.reflect.Field;
+import java.util.HashSet;
+import java.util.Set;
 
-import org.springframework.data.elasticsearch.annotations.Parent;
-import org.springframework.data.elasticsearch.annotations.Score;
 import org.springframework.data.mapping.Association;
-import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.PersistentEntity;
 import org.springframework.data.mapping.model.AnnotationBasedPersistentProperty;
-import org.springframework.data.mapping.model.Property;
 import org.springframework.data.mapping.model.SimpleTypeHolder;
 
 /**
@@ -32,93 +30,36 @@ import org.springframework.data.mapping.model.SimpleTypeHolder;
  *
  * @author Rizwan Idrees
  * @author Mohsin Husen
- * @author Mark Paluch
- * @author Sascha Woo
- * @author Oliver Gierke
  */
 public class SimpleElasticsearchPersistentProperty extends
 		AnnotationBasedPersistentProperty<ElasticsearchPersistentProperty> implements ElasticsearchPersistentProperty {
 
-	private static final List<String> SUPPORTED_ID_PROPERTY_NAMES = Arrays.asList("id", "document");
+	private static final Set<Class<?>> SUPPORTED_ID_TYPES = new HashSet<Class<?>>();
+	private static final Set<String> SUPPORTED_ID_PROPERTY_NAMES = new HashSet<String>();
 
-	private final boolean isScore;
-	private final boolean isParent;
-	private final boolean isId;
-
-	public SimpleElasticsearchPersistentProperty(Property property,
-			PersistentEntity<?, ElasticsearchPersistentProperty> owner, SimpleTypeHolder simpleTypeHolder) {
-
-		super(property, owner, simpleTypeHolder);
-
-		this.isId = super.isIdProperty() || SUPPORTED_ID_PROPERTY_NAMES.contains(getFieldName());
-		this.isScore = isAnnotationPresent(Score.class);
-		this.isParent = isAnnotationPresent(Parent.class);
-
-		if (isVersionProperty() && getType() != Long.class) {
-			throw new MappingException(String.format("Version property %s must be of type Long!", property.getName()));
-		}
-
-		if (isScore && !Arrays.asList(Float.TYPE, Float.class).contains(getType())) {
-			throw new MappingException(
-					String.format("Score property %s must be either of type float or Float!", property.getName()));
-		}
-
-		if (isParent && getType() != String.class) {
-			throw new MappingException(String.format("Parent property %s must be of type String!", property.getName()));
-		}
+	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);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty#getFieldName()
-	 */
 	@Override
 	public String getFieldName() {
-		return getProperty().getName();
+		return field.getName();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.model.AnnotationBasedPersistentProperty#isIdProperty()
-	 */
 	@Override
 	public boolean isIdProperty() {
-		return isId;
+		return super.isIdProperty() || (field != null ? SUPPORTED_ID_PROPERTY_NAMES.contains(getFieldName()) : false);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.model.AbstractPersistentProperty#createAssociation()
-	 */
 	@Override
 	protected Association<ElasticsearchPersistentProperty> createAssociation() {
 		return null;
 	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty#isScoreProperty()
-	 */
-	@Override
-	public boolean isScoreProperty() {
-		return isScore;
-	}
-
-	/* 
-	 * (non-Javadoc)
-	 * @see org.springframework.data.mapping.model.AbstractPersistentProperty#isImmutable()
-	 */
-	@Override
-	public boolean isImmutable() {
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty#isParentProperty()
-	 */
-	@Override
-	public boolean isParentProperty() {
-		return isParent;
-	}
 }

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,11 @@
  */
 package org.springframework.data.elasticsearch.core.query;
 
-import static java.util.Collections.*;
-
+import static java.util.Collections.addAll;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-
 import org.elasticsearch.action.search.SearchType;
-import org.elasticsearch.action.support.IndicesOptions;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
 import org.springframework.util.Assert;
@@ -33,23 +30,19 @@ import org.springframework.util.Assert;
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Mark Paluch
- * @author Alen Turkovic
- * @author Sascha Woo
  */
 abstract class AbstractQuery implements Query {
 
 	protected Pageable pageable = DEFAULT_PAGE;
 	protected Sort sort;
-	protected List<String> indices = new ArrayList<>();
-	protected List<String> types = new ArrayList<>();
-	protected List<String> fields = new ArrayList<>();
+	protected List<String> indices = new ArrayList<String>();
+	protected List<String> types = new ArrayList<String>();
+	protected List<String> fields = new ArrayList<String>();
 	protected SourceFilter sourceFilter;
 	protected float minScore;
 	protected Collection<String> ids;
 	protected String route;
 	protected SearchType searchType = SearchType.DFS_QUERY_THEN_FETCH;
-	protected IndicesOptions indicesOptions;
-	protected boolean trackScores;
 
 	@Override
 	public Sort getSort() {
@@ -156,31 +149,4 @@ abstract class AbstractQuery implements Query {
 	public SearchType getSearchType() {
 		return searchType;
 	}
-
-	public IndicesOptions getIndicesOptions() {
-		return indicesOptions;
-	}
-
-	public void setIndicesOptions(IndicesOptions indicesOptions) {
-		this.indicesOptions = indicesOptions;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.core.query.Query#getTrackScores()
-	 */
-	@Override
-	public boolean getTrackScores() {
-		return trackScores;
-	}
-
-	/**
-	 * Configures whether to track scores.
-	 * 
-	 * @param trackScores
-	 * @since 3.1
-	 */
-	public void setTrackScores(boolean trackScores) {
-		this.trackScores = trackScores;
-	}
 }

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,7 @@ package org.springframework.data.elasticsearch.core.query;
 
 import java.util.*;
 
-import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.data.elasticsearch.core.geo.GeoBox;
 import org.springframework.data.elasticsearch.core.geo.GeoPoint;
@@ -43,8 +42,8 @@ public class Criteria {
 				"field=" + field.getName() +
 				", boost=" + boost +
 				", negating=" + negating +
-				", queryCriteria=" + ObjectUtils.nullSafeToString(queryCriteria) +
-				", filterCriteria=" + ObjectUtils.nullSafeToString(filterCriteria) +
+				", queryCriteria=" + StringUtils.join(queryCriteria, '|') +
+				", filterCriteria=" + StringUtils.join(filterCriteria, '|') +
 				'}';
 	}
 
@@ -58,11 +57,11 @@ public class Criteria {
 	private float boost = Float.NaN;
 	private boolean negating = false;
 
-	private List<Criteria> criteriaChain = new ArrayList<>(1);
+	private List<Criteria> criteriaChain = new ArrayList<Criteria>(1);
 
-	private Set<CriteriaEntry> queryCriteria = new LinkedHashSet<>();
+	private Set<CriteriaEntry> queryCriteria = new LinkedHashSet<CriteriaEntry>();
 
-	private Set<CriteriaEntry> filterCriteria = new LinkedHashSet<>();
+	private Set<CriteriaEntry> filterCriteria = new LinkedHashSet<CriteriaEntry>();
 
 	public Criteria() {
 	}
@@ -438,7 +437,7 @@ public class Criteria {
 	 * @return
 	 */
 	public Criteria within(String geoLocation, String distance) {
-		Assert.isTrue(!StringUtils.isEmpty(geoLocation), "geoLocation value must not be null");
+		Assert.isTrue(StringUtils.isNotBlank(geoLocation), "geoLocation value must not be null");
 		filterCriteria.add(new CriteriaEntry(OperationKey.WITHIN, new Object[]{geoLocation, distance}));
 		return this;
 	}
@@ -475,8 +474,8 @@ public class Criteria {
 	 * @return Criteria the chaind criteria with the new 'boundedBy' criteria included.
 	 */
 	public Criteria boundedBy(String topLeftGeohash, String bottomRightGeohash) {
-		Assert.isTrue(!StringUtils.isEmpty(topLeftGeohash), "topLeftGeohash must not be empty");
-		Assert.isTrue(!StringUtils.isEmpty(bottomRightGeohash), "bottomRightGeohash must not be empty");
+		Assert.isTrue(StringUtils.isNotBlank(topLeftGeohash), "topLeftGeohash must not be empty");
+		Assert.isTrue(StringUtils.isNotBlank(bottomRightGeohash), "bottomRightGeohash must not be empty");
 		filterCriteria.add(new CriteriaEntry(OperationKey.BBOX, new Object[]{topLeftGeohash, bottomRightGeohash}));
 		return this;
 	}
@@ -503,7 +502,7 @@ public class Criteria {
 	}
 
 	private void assertNoBlankInWildcardedQuery(String searchString, boolean leadingWildcard, boolean trailingWildcard) {
-		if (searchString != null && searchString.contains(CRITERIA_VALUE_SEPERATOR)) {
+		if (StringUtils.contains(searchString, CRITERIA_VALUE_SEPERATOR)) {
 			throw new InvalidDataAccessApiUsageException("Cannot constructQuery '" + (leadingWildcard ? "*" : "") + "\""
 					+ searchString + "\"" + (trailingWildcard ? "*" : "") + "'. Use expression or multiple clauses instead.");
 		}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2019 the original author 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,20 @@ import org.springframework.data.domain.Pageable;
  * @author Rizwan Idrees
  * @author Mohsin Husen
  */
+
 public class MoreLikeThisQuery {
 
 	private String id;
 	private String indexName;
 	private String type;
-	private List<String> searchIndices = new ArrayList<>();
-	private List<String> searchTypes = new ArrayList<>();
-	private List<String> fields = new ArrayList<>();
+	private List<String> searchIndices = new ArrayList<String>();
+	private List<String> searchTypes = new ArrayList<String>();
+	private List<String> fields = new ArrayList<String>();
 	private String routing;
 	private Float percentTermsToMatch;
 	private Integer minTermFreq;
 	private Integer maxQueryTerms;
-	private List<String> stopWords = new ArrayList<>();
+	private List<String> stopWords = new ArrayList<String>();
 	private Integer minDocFreq;
 	private Integer maxDocFreq;
 	private Integer minWordLen;

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2020 the original author or authors.
+ * Copyright 2013-2019 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import java.util.List;
 
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.search.aggregations.AbstractAggregationBuilder;
-import org.elasticsearch.search.fetch.subphase.highlight.HighlightBuilder;
+import org.elasticsearch.search.highlight.HighlightBuilder;
 import org.elasticsearch.search.sort.SortBuilder;
 import org.springframework.data.elasticsearch.core.facet.FacetRequest;
 
@@ -32,17 +32,15 @@ import java.util.Arrays;
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Artur Konczak
- * @author Jean-Baptiste Nizet
  */
 public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
 
 	private QueryBuilder query;
 	private QueryBuilder filter;
 	private List<SortBuilder> sorts;
-    private final List<ScriptField> scriptFields = new ArrayList<>();
+    private final List<ScriptField> scriptFields = new ArrayList<ScriptField>();
 	private List<FacetRequest> facets;
 	private List<AbstractAggregationBuilder> aggregations;
-	private HighlightBuilder highlightBuilder;
 	private HighlightBuilder.Field[] highlightFields;
 	private List<IndexBoost> indicesBoost;
 
@@ -69,15 +67,6 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
 		this.highlightFields = highlightFields;
 	}
 
-	public NativeSearchQuery(QueryBuilder query, QueryBuilder filter, List<SortBuilder> sorts,
-			HighlightBuilder highlighBuilder, HighlightBuilder.Field[] highlightFields) {
-		this.query = query;
-		this.filter = filter;
-		this.sorts = sorts;
-		this.highlightBuilder = highlighBuilder;
-		this.highlightFields = highlightFields;
-	}
-
 	public QueryBuilder getQuery() {
 		return query;
 	}
@@ -90,11 +79,6 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
 		return sorts;
 	}
 
-	@Override
-	public HighlightBuilder getHighlightBuilder() {
-		return highlightBuilder;
-	}
-
 	@Override
 	public HighlightBuilder.Field[] getHighlightFields() {
 		return highlightFields;
@@ -113,7 +97,7 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
 
 	public void addFacet(FacetRequest facetRequest) {
 		if (facets == null) {
-			facets = new ArrayList<>();
+			facets = new ArrayList<FacetRequest>();
 		}
 		facets.add(facetRequest);
 	}
@@ -135,7 +119,7 @@ public class NativeSearchQuery extends AbstractQuery implements SearchQuery {
 
 	public void addAggregation(AbstractAggregationBuilder aggregationBuilder) {
 		if (aggregations == null) {
-			aggregations = new ArrayList<>();
+			aggregations = new ArrayList<AbstractAggregationBuilder>();
 		}
 		aggregations.add(aggregationBuilder);
 	}