Release version 4.2.2 (2021.0.2).

See #1814

Jenkinsfile

@@ -3,7 +3,7 @@ pipeline {
 
 	triggers {
 		pollSCM 'H/10 * * * *'
-		upstream(upstreamProjects: "spring-data-commons/master", threshold: hudson.model.Result.SUCCESS)
+		upstream(upstreamProjects: "spring-data-commons/2.5.x", threshold: hudson.model.Result.SUCCESS)
 	}
 
 	options {
@@ -15,7 +15,7 @@ pipeline {
 		stage("test: baseline (jdk8)") {
 			when {
 				anyOf {
-					branch 'master'
+					branch '4.2.x'
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
@@ -26,6 +26,7 @@ pipeline {
 
 			environment {
 				DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
+				ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
 			}
 
 			steps {
@@ -44,7 +45,7 @@ pipeline {
 		stage("Test other configurations") {
 			when {
 				allOf {
-					branch 'master'
+					branch '4.2.x'
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
@@ -57,6 +58,7 @@ pipeline {
 
 					environment {
 						DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
+						ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
 					}
 
 					steps {
@@ -80,6 +82,7 @@ pipeline {
 
 					environment {
 						DOCKER_HUB = credentials('hub.docker.com-springbuildmaster')
+						ARTIFACTORY = credentials('02bd1690-b54f-4c9f-819d-a77cb7a9822c')
 					}
 
 					steps {
@@ -100,7 +103,7 @@ pipeline {
 		stage('Release to artifactory') {
 			when {
 				anyOf {
-					branch 'master'
+					branch '4.2.x'
 					not { triggeredBy 'UpstreamCause' }
 				}
 			}
@@ -117,7 +120,7 @@ pipeline {
 				script {
 					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
 						docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
-							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root ' +
+							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,artifactory -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root ' +
 									'-Dartifactory.server=https://repo.spring.io ' +
 									"-Dartifactory.username=${ARTIFACTORY_USR} " +
 									"-Dartifactory.password=${ARTIFACTORY_PSW} " +
@@ -132,7 +135,7 @@ pipeline {
 		}
 		stage('Publish documentation') {
 			when {
-				branch 'master'
+				branch '4.2.x'
 			}
 			agent {
 				label 'data'
@@ -147,7 +150,7 @@ pipeline {
 				script {
 					docker.withRegistry('', 'hub.docker.com-springbuildmaster') {
 						docker.image('adoptopenjdk/openjdk8:latest').inside('-v $HOME:/tmp/jenkins-home') {
-							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root ' +
+							sh 'MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" ./mvnw -s settings.xml -Pci,distribute -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch-non-root ' +
 									'-Dartifactory.server=https://repo.spring.io ' +
 									"-Dartifactory.username=${ARTIFACTORY_USR} " +
 									"-Dartifactory.password=${ARTIFACTORY_PSW} " +

LICENSE.txt

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        https://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   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.

ci/clean.sh

@@ -3,4 +3,4 @@
 set -euo pipefail
 
 MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
-  ./mvnw clean -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch
+  ./mvnw -s settings.xml clean -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch

ci/verify.sh

@@ -6,5 +6,5 @@ mkdir -p /tmp/jenkins-home/.m2/spring-data-elasticsearch
 chown -R 1001:1001 .
 
 MAVEN_OPTS="-Duser.name=jenkins -Duser.home=/tmp/jenkins-home" \
-  ./mvnw \
+  ./mvnw -s settings.xml \
   -P${PROFILE} clean dependency:list verify -Dsort -U -B -Dmaven.repo.local=/tmp/jenkins-home/.m2/spring-data-elasticsearch

pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>4.2.0</version>
+	<version>4.2.2</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.5.0</version>
+		<version>2.5.2</version>
 	</parent>
 
 	<name>Spring Data Elasticsearch</name>
@@ -19,10 +19,10 @@
 
 	<properties>
 		<commonslang>2.6</commonslang>
-		<elasticsearch>7.12.0</elasticsearch>
+		<elasticsearch>7.12.1</elasticsearch>
 		<log4j>2.13.3</log4j>
 		<netty>4.1.52.Final</netty>
-		<springdata.commons>2.5.0</springdata.commons>
+		<springdata.commons>2.5.2</springdata.commons>
 		<testcontainers>1.15.1</testcontainers>
 		<java-module-name>spring.data.elasticsearch</java-module-name>
 	</properties>
@@ -484,11 +484,10 @@
 			<url>https://repo.spring.io/libs-release</url>
 		</repository>
 
-			<repository>
-				<id>local-maven-repo</id>
-				<url>file:///${project.basedir}/src/test/resources/local-maven-repo</url>
-			</repository>
-
+		<repository>
+			<id>local-maven-repo</id>
+			<url>file:///${project.basedir}/src/test/resources/local-maven-repo</url>
+		</repository>
 	</repositories>
 
 	<pluginRepositories>
@@ -496,11 +495,6 @@
 			<id>spring-plugins-release</id>
 			<url>https://repo.spring.io/plugins-release</url>
 		</pluginRepository>
-		<pluginRepository>
-			<id>bintray-plugins</id>
-			<name>bintray-plugins</name>
-			<url>https://jcenter.bintray.com</url>
-		</pluginRepository>
 	</pluginRepositories>
 
 </project>

settings.xml

@@ -0,0 +1,29 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      https://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+	<servers>
+		<server>
+			<id>spring-plugins-release</id>
+			<username>${env.ARTIFACTORY_USR}</username>
+			<password>${env.ARTIFACTORY_PSW}</password>
+		</server>
+		<server>
+			<id>spring-libs-snapshot</id>
+			<username>${env.ARTIFACTORY_USR}</username>
+			<password>${env.ARTIFACTORY_PSW}</password>
+		</server>
+		<server>
+			<id>spring-libs-milestone</id>
+			<username>${env.ARTIFACTORY_USR}</username>
+			<password>${env.ARTIFACTORY_PSW}</password>
+		</server>
+		<server>
+			<id>spring-libs-release</id>
+			<username>${env.ARTIFACTORY_USR}</username>
+			<password>${env.ARTIFACTORY_PSW}</password>
+		</server>
+	</servers>
+
+</settings>

src/main/asciidoc/preface.adoc

@@ -34,7 +34,7 @@ The following table shows the Elasticsearch versions that are used by Spring Dat
 [cols="^,^,^,^,^",options="header"]
 |===
 | Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework | Spring Boot
-| 2021.0 (Pascal)footnote:cdv[Currently in development] | 4.2.xfootnote:cdv[] | 7.12.0 | 5.3.xfootnote:cdv[] | 2.4.xfootnote:cdv[]
+| 2021.0 (Pascal) | 4.2.1 | 7.12.1 | 5.3.7 | 2.5.x
 | 2020.0 (Ockham) | 4.1.x | 7.9.3 | 5.3.2 | 2.4.x
 | Neumann | 4.0.x | 7.6.2 | 5.2.12 |2.3.x
 | Moore | 3.2.x |6.8.12 | 5.2.12| 2.2.x

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

@@ -30,11 +30,15 @@ public class Person implements Persistable<Long> {
     @Id private Long id;
     private String lastName;
     private String firstName;
+    @CreatedDate
     @Field(type = FieldType.Date, format = DateFormat.basic_date_time)
     private Instant createdDate;
+    @CreatedBy
     private String createdBy
     @Field(type = FieldType.Date, format = DateFormat.basic_date_time)
+    @LastModifiedDate
     private Instant lastModifiedDate;
+    @LastModifiedBy
     private String lastModifiedBy;
 
     public Long getId() {                                                 // <.>

src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultReactiveElasticsearchClient.java

@@ -281,15 +281,23 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 			scheme = "https";
 		}
 
-		ReactorClientHttpConnector connector = new ReactorClientHttpConnector(httpClient);
-		WebClientProvider provider = WebClientProvider.create(scheme, connector);
+		WebClientProvider provider = WebClientProvider.create(scheme, new ReactorClientHttpConnector(httpClient));
 
 		if (clientConfiguration.getPathPrefix() != null) {
 			provider = provider.withPathPrefix(clientConfiguration.getPathPrefix());
 		}
 
-		provider = provider.withDefaultHeaders(clientConfiguration.getDefaultHeaders()) //
-				.withWebClientConfigurer(clientConfiguration.getWebClientConfigurer());
+		provider = provider //
+				.withDefaultHeaders(clientConfiguration.getDefaultHeaders()) //
+				.withWebClientConfigurer(clientConfiguration.getWebClientConfigurer()) //
+				.withRequestConfigurer(requestHeadersSpec -> requestHeadersSpec.headers(httpHeaders -> {
+					HttpHeaders suppliedHeaders = clientConfiguration.getHeadersSupplier().get();
+
+					if (suppliedHeaders != null && suppliedHeaders != HttpHeaders.EMPTY) {
+						httpHeaders.addAll(suppliedHeaders);
+					}
+				}));
+
 		return provider;
 	}
 
@@ -584,12 +592,6 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 							request.getOptions().getHeaders().forEach(it -> theHeaders.add(it.getName(), it.getValue()));
 						}
 					}
-
-					// plus the ones from the supplier
-					HttpHeaders suppliedHeaders = headersSupplier.get();
-					if (suppliedHeaders != null && suppliedHeaders != HttpHeaders.EMPTY) {
-						theHeaders.addAll(suppliedHeaders);
-					}
 				});
 
 		if (request.getEntity() != null) {
@@ -599,8 +601,8 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
 			ClientLogger.logRequest(logId, request.getMethod().toUpperCase(), request.getEndpoint(), request.getParameters(),
 					body::get);
 
-			requestBodySpec.contentType(MediaType.valueOf(request.getEntity().getContentType().getValue()));
-			requestBodySpec.body(Mono.fromSupplier(body), String.class);
+			requestBodySpec.contentType(MediaType.valueOf(request.getEntity().getContentType().getValue()))
+					.body(Mono.fromSupplier(body), String.class);
 		} else {
 			ClientLogger.logRequest(logId, request.getMethod().toUpperCase(), request.getEndpoint(), request.getParameters());
 		}

src/main/java/org/springframework/data/elasticsearch/client/reactive/DefaultWebClientProvider.java

@@ -48,6 +48,7 @@ class DefaultWebClientProvider implements WebClientProvider {
 	private final HttpHeaders headers;
 	private final @Nullable String pathPrefix;
 	private final Function<WebClient, WebClient> webClientConfigurer;
+	private final Consumer<WebClient.RequestHeadersSpec<?>> requestConfigurer;
 
 	/**
 	 * Create new {@link DefaultWebClientProvider} with empty {@link HttpHeaders} and no-op {@literal error listener}.
@@ -56,7 +57,7 @@ class DefaultWebClientProvider implements WebClientProvider {
 	 * @param connector can be {@literal null}.
 	 */
 	DefaultWebClientProvider(String scheme, @Nullable ClientHttpConnector connector) {
-		this(scheme, connector, e -> {}, HttpHeaders.EMPTY, null, Function.identity());
+		this(scheme, connector, e -> {}, HttpHeaders.EMPTY, null, Function.identity(), requestHeadersSpec -> {});
 	}
 
 	/**
@@ -66,18 +67,21 @@ class DefaultWebClientProvider implements WebClientProvider {
 	 * @param connector can be {@literal null}.
 	 * @param errorListener must not be {@literal null}.
 	 * @param headers must not be {@literal null}.
-	 * @param pathPrefix can be {@literal null}
+	 * @param pathPrefix can be {@literal null}.
 	 * @param webClientConfigurer must not be {@literal null}.
+	 * @param requestConfigurer must not be {@literal null}.
 	 */
 	private DefaultWebClientProvider(String scheme, @Nullable ClientHttpConnector connector,
 			Consumer<Throwable> errorListener, HttpHeaders headers, @Nullable String pathPrefix,
-			Function<WebClient, WebClient> webClientConfigurer) {
+			Function<WebClient, WebClient> webClientConfigurer, Consumer<WebClient.RequestHeadersSpec<?>> requestConfigurer) {
 
 		Assert.notNull(scheme, "Scheme must not be null! A common scheme would be 'http'.");
 		Assert.notNull(errorListener, "errorListener must not be null! You may want use a no-op one 'e -> {}' instead.");
 		Assert.notNull(headers, "headers must not be null! Think about using 'HttpHeaders.EMPTY' as an alternative.");
 		Assert.notNull(webClientConfigurer,
 				"webClientConfigurer must not be null! You may want use a no-op one 'Function.identity()' instead.");
+		Assert.notNull(requestConfigurer,
+				"requestConfigurer must not be null! You may want use a no-op one 'r -> {}' instead.\"");
 
 		this.cachedClients = new ConcurrentHashMap<>();
 		this.scheme = scheme;
@@ -86,6 +90,7 @@ class DefaultWebClientProvider implements WebClientProvider {
 		this.headers = headers;
 		this.pathPrefix = pathPrefix;
 		this.webClientConfigurer = webClientConfigurer;
+		this.requestConfigurer = requestConfigurer;
 	}
 
 	@Override
@@ -106,6 +111,7 @@ class DefaultWebClientProvider implements WebClientProvider {
 		return this.errorListener;
 	}
 
+	@Nullable
 	@Override
 	public String getPathPrefix() {
 		return pathPrefix;
@@ -120,7 +126,17 @@ class DefaultWebClientProvider implements WebClientProvider {
 		merged.addAll(this.headers);
 		merged.addAll(headers);
 
-		return new DefaultWebClientProvider(scheme, connector, errorListener, merged, pathPrefix, webClientConfigurer);
+		return new DefaultWebClientProvider(scheme, connector, errorListener, merged, pathPrefix, webClientConfigurer,
+				requestConfigurer);
+	}
+
+	@Override
+	public WebClientProvider withRequestConfigurer(Consumer<WebClient.RequestHeadersSpec<?>> requestConfigurer) {
+
+		Assert.notNull(requestConfigurer, "requestConfigurer must not be null.");
+
+		return new DefaultWebClientProvider(scheme, connector, errorListener, headers, pathPrefix, webClientConfigurer,
+				requestConfigurer);
 	}
 
 	@Override
@@ -129,7 +145,8 @@ class DefaultWebClientProvider implements WebClientProvider {
 		Assert.notNull(errorListener, "Error listener must not be null.");
 
 		Consumer<Throwable> listener = this.errorListener.andThen(errorListener);
-		return new DefaultWebClientProvider(scheme, this.connector, listener, headers, pathPrefix, webClientConfigurer);
+		return new DefaultWebClientProvider(scheme, this.connector, listener, headers, pathPrefix, webClientConfigurer,
+				requestConfigurer);
 	}
 
 	@Override
@@ -137,18 +154,21 @@ class DefaultWebClientProvider implements WebClientProvider {
 		Assert.notNull(pathPrefix, "pathPrefix must not be null.");
 
 		return new DefaultWebClientProvider(this.scheme, this.connector, this.errorListener, this.headers, pathPrefix,
-				webClientConfigurer);
+				webClientConfigurer, requestConfigurer);
 	}
 
 	@Override
 	public WebClientProvider withWebClientConfigurer(Function<WebClient, WebClient> webClientConfigurer) {
-		return new DefaultWebClientProvider(scheme, connector, errorListener, headers, pathPrefix, webClientConfigurer);
+		return new DefaultWebClientProvider(scheme, connector, errorListener, headers, pathPrefix, webClientConfigurer,
+				requestConfigurer);
 
 	}
 
 	protected WebClient createWebClientForSocketAddress(InetSocketAddress socketAddress) {
 
-		Builder builder = WebClient.builder().defaultHeaders(it -> it.addAll(getDefaultHeaders()));
+		Builder builder = WebClient.builder() //
+				.defaultHeaders(it -> it.addAll(getDefaultHeaders())) //
+				.defaultRequest(requestConfigurer);
 
 		if (connector != null) {
 			builder = builder.clientConnector(connector);

src/main/java/org/springframework/data/elasticsearch/client/reactive/HostProvider.java

@@ -54,9 +54,9 @@ public interface HostProvider<T extends HostProvider<T>> {
 		Assert.notEmpty(endpoints, "Please provide at least one endpoint to connect to.");
 
 		if (endpoints.length == 1) {
-			return new SingleNodeHostProvider(clientProvider, headersSupplier, endpoints[0]);
+			return new SingleNodeHostProvider(clientProvider, endpoints[0]);
 		} else {
-			return new MultiNodeHostProvider(clientProvider, headersSupplier, endpoints);
+			return new MultiNodeHostProvider(clientProvider, endpoints);
 		}
 	}
 

src/main/java/org/springframework/data/elasticsearch/client/reactive/MultiNodeHostProvider.java

@@ -28,14 +28,12 @@ import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Supplier;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.elasticsearch.client.ElasticsearchHost;
 import org.springframework.data.elasticsearch.client.ElasticsearchHost.State;
 import org.springframework.data.elasticsearch.client.NoReachableHostException;
-import org.springframework.http.HttpHeaders;
 import org.springframework.lang.Nullable;
 import org.springframework.web.reactive.function.client.ClientResponse;
 import org.springframework.web.reactive.function.client.WebClient;
@@ -53,14 +51,11 @@ class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
 	private final static Logger LOG = LoggerFactory.getLogger(MultiNodeHostProvider.class);
 
 	private final WebClientProvider clientProvider;
-	private final Supplier<HttpHeaders> headersSupplier;
 	private final Map<InetSocketAddress, ElasticsearchHost> hosts;
 
-	MultiNodeHostProvider(WebClientProvider clientProvider, Supplier<HttpHeaders> headersSupplier,
-			InetSocketAddress... endpoints) {
+	MultiNodeHostProvider(WebClientProvider clientProvider, InetSocketAddress... endpoints) {
 
 		this.clientProvider = clientProvider;
-		this.headersSupplier = headersSupplier;
 		this.hosts = new ConcurrentHashMap<>();
 		for (InetSocketAddress endpoint : endpoints) {
 			this.hosts.put(endpoint, new ElasticsearchHost(endpoint, State.UNKNOWN));
@@ -166,7 +161,6 @@ class MultiNodeHostProvider implements HostProvider<MultiNodeHostProvider> {
 
 					Mono<ClientResponse> clientResponseMono = createWebClient(host) //
 							.head().uri("/") //
-							.headers(httpHeaders -> httpHeaders.addAll(headersSupplier.get())) //
 							.exchangeToMono(Mono::just) //
 							.timeout(Duration.ofSeconds(1)) //
 							.doOnError(throwable -> {

src/main/java/org/springframework/data/elasticsearch/client/reactive/SingleNodeHostProvider.java

@@ -19,12 +19,10 @@ import reactor.core.publisher.Mono;
 
 import java.net.InetSocketAddress;
 import java.util.Collections;
-import java.util.function.Supplier;
 
 import org.springframework.data.elasticsearch.client.ElasticsearchHost;
 import org.springframework.data.elasticsearch.client.ElasticsearchHost.State;
 import org.springframework.data.elasticsearch.client.NoReachableHostException;
-import org.springframework.http.HttpHeaders;
 import org.springframework.web.reactive.function.client.WebClient;
 
 /**
@@ -38,15 +36,12 @@ import org.springframework.web.reactive.function.client.WebClient;
 class SingleNodeHostProvider implements HostProvider<SingleNodeHostProvider> {
 
 	private final WebClientProvider clientProvider;
-	private final Supplier<HttpHeaders> headersSupplier;
 	private final InetSocketAddress endpoint;
 	private volatile ElasticsearchHost state;
 
-	SingleNodeHostProvider(WebClientProvider clientProvider, Supplier<HttpHeaders> headersSupplier,
-			InetSocketAddress endpoint) {
+	SingleNodeHostProvider(WebClientProvider clientProvider, InetSocketAddress endpoint) {
 
 		this.clientProvider = clientProvider;
-		this.headersSupplier = headersSupplier;
 		this.endpoint = endpoint;
 		this.state = new ElasticsearchHost(this.endpoint, State.UNKNOWN);
 	}
@@ -60,7 +55,6 @@ class SingleNodeHostProvider implements HostProvider<SingleNodeHostProvider> {
 
 		return createWebClient(endpoint) //
 				.head().uri("/") //
-				.headers(httpHeaders -> httpHeaders.addAll(headersSupplier.get())) //
 				.exchangeToMono(it -> {
 					if (it.statusCode().isError()) {
 						state = ElasticsearchHost.offline(endpoint);

src/main/java/org/springframework/data/elasticsearch/client/reactive/WebClientProvider.java

@@ -101,7 +101,7 @@ public interface WebClientProvider {
 
 	/**
 	 * Obtain the {@link String pathPrefix} to be used.
-	 * 
+	 *
 	 * @return the pathPrefix if set.
 	 * @since 4.0
 	 */
@@ -126,7 +126,7 @@ public interface WebClientProvider {
 
 	/**
 	 * Create a new instance of {@link WebClientProvider} where HTTP requests are called with the given path prefix.
-	 * 
+	 *
 	 * @param pathPrefix Path prefix to add to requests
 	 * @return new instance of {@link WebClientProvider}
 	 * @since 4.0
@@ -136,10 +136,20 @@ public interface WebClientProvider {
 	/**
 	 * Create a new instance of {@link WebClientProvider} calling the given {@link Function} to configure the
 	 * {@link WebClient}.
-	 * 
+	 *
 	 * @param webClientConfigurer configuration function
 	 * @return new instance of {@link WebClientProvider}
 	 * @since 4.0
 	 */
 	WebClientProvider withWebClientConfigurer(Function<WebClient, WebClient> webClientConfigurer);
+
+	/**
+	 * Create a new instance of {@link WebClientProvider} calling the given {@link Consumer} to configure the requests of
+	 * this {@link WebClient}.
+	 *
+	 * @param requestConfigurer request configuration callback
+	 * @return new instance of {@link WebClientProvider}
+	 * @since 4.3
+	 */
+	WebClientProvider withRequestConfigurer(Consumer<WebClient.RequestHeadersSpec<?>> requestConfigurer);
 }

src/main/java/org/springframework/data/elasticsearch/client/util/NamedXContents.java

@@ -20,6 +20,12 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import org.elasticsearch.client.analytics.InferencePipelineAggregationBuilder;
+import org.elasticsearch.client.analytics.ParsedInference;
+import org.elasticsearch.client.analytics.ParsedStringStats;
+import org.elasticsearch.client.analytics.ParsedTopMetrics;
+import org.elasticsearch.client.analytics.StringStatsAggregationBuilder;
+import org.elasticsearch.client.analytics.TopMetricsAggregationBuilder;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.xcontent.ContextParser;
 import org.elasticsearch.common.xcontent.NamedXContentRegistry;
@@ -44,6 +50,8 @@ import org.elasticsearch.search.aggregations.bucket.histogram.HistogramAggregati
 import org.elasticsearch.search.aggregations.bucket.histogram.ParsedAutoDateHistogram;
 import org.elasticsearch.search.aggregations.bucket.histogram.ParsedDateHistogram;
 import org.elasticsearch.search.aggregations.bucket.histogram.ParsedHistogram;
+import org.elasticsearch.search.aggregations.bucket.histogram.ParsedVariableWidthHistogram;
+import org.elasticsearch.search.aggregations.bucket.histogram.VariableWidthHistogramAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.missing.MissingAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.missing.ParsedMissing;
 import org.elasticsearch.search.aggregations.bucket.nested.NestedAggregationBuilder;
@@ -60,12 +68,7 @@ import org.elasticsearch.search.aggregations.bucket.range.ParsedRange;
 import org.elasticsearch.search.aggregations.bucket.range.RangeAggregationBuilder;
 import org.elasticsearch.search.aggregations.bucket.sampler.InternalSampler;
 import org.elasticsearch.search.aggregations.bucket.sampler.ParsedSampler;
-import org.elasticsearch.search.aggregations.bucket.terms.DoubleTerms;
-import org.elasticsearch.search.aggregations.bucket.terms.LongTerms;
-import org.elasticsearch.search.aggregations.bucket.terms.ParsedDoubleTerms;
-import org.elasticsearch.search.aggregations.bucket.terms.ParsedLongTerms;
-import org.elasticsearch.search.aggregations.bucket.terms.ParsedStringTerms;
-import org.elasticsearch.search.aggregations.bucket.terms.StringTerms;
+import org.elasticsearch.search.aggregations.bucket.terms.*;
 import org.elasticsearch.search.aggregations.metrics.*;
 import org.elasticsearch.search.aggregations.pipeline.*;
 import org.elasticsearch.search.suggest.Suggest;
@@ -81,7 +84,7 @@ import org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsea
  * <p>
  * Original implementation source {@link org.elasticsearch.client.RestHighLevelClient#getDefaultNamedXContents()} by
  * {@literal Elasticsearch} (<a href="https://www.elastic.co">https://www.elastic.co</a>) licensed under the Apache
- * License, Version 2.0.
+ * License, Version 2.0. The latest version used from Elasticsearch is 7.10.2.
  * </p>
  * Modified for usage with {@link ReactiveElasticsearchClient}.
  * <p>
@@ -126,9 +129,13 @@ public class NamedXContents {
 		map.put(HistogramAggregationBuilder.NAME, (p, c) -> ParsedHistogram.fromXContent(p, (String) c));
 		map.put(DateHistogramAggregationBuilder.NAME, (p, c) -> ParsedDateHistogram.fromXContent(p, (String) c));
 		map.put(AutoDateHistogramAggregationBuilder.NAME, (p, c) -> ParsedAutoDateHistogram.fromXContent(p, (String) c));
+		map.put(VariableWidthHistogramAggregationBuilder.NAME,
+				(p, c) -> ParsedVariableWidthHistogram.fromXContent(p, (String) c));
 		map.put(StringTerms.NAME, (p, c) -> ParsedStringTerms.fromXContent(p, (String) c));
 		map.put(LongTerms.NAME, (p, c) -> ParsedLongTerms.fromXContent(p, (String) c));
 		map.put(DoubleTerms.NAME, (p, c) -> ParsedDoubleTerms.fromXContent(p, (String) c));
+		map.put(LongRareTerms.NAME, (p, c) -> ParsedLongRareTerms.fromXContent(p, (String) c));
+		map.put(StringRareTerms.NAME, (p, c) -> ParsedStringRareTerms.fromXContent(p, (String) c));
 		map.put(MissingAggregationBuilder.NAME, (p, c) -> ParsedMissing.fromXContent(p, (String) c));
 		map.put(NestedAggregationBuilder.NAME, (p, c) -> ParsedNested.fromXContent(p, (String) c));
 		map.put(ReverseNestedAggregationBuilder.NAME, (p, c) -> ParsedReverseNested.fromXContent(p, (String) c));
@@ -142,10 +149,15 @@ public class NamedXContents {
 		map.put(GeoDistanceAggregationBuilder.NAME, (p, c) -> ParsedGeoDistance.fromXContent(p, (String) c));
 		map.put(FiltersAggregationBuilder.NAME, (p, c) -> ParsedFilters.fromXContent(p, (String) c));
 		map.put(AdjacencyMatrixAggregationBuilder.NAME, (p, c) -> ParsedAdjacencyMatrix.fromXContent(p, (String) c));
+		map.put(SignificantLongTerms.NAME, (p, c) -> ParsedSignificantLongTerms.fromXContent(p, (String) c));
+		map.put(SignificantStringTerms.NAME, (p, c) -> ParsedSignificantStringTerms.fromXContent(p, (String) c));
 		map.put(ScriptedMetricAggregationBuilder.NAME, (p, c) -> ParsedScriptedMetric.fromXContent(p, (String) c));
 		map.put(IpRangeAggregationBuilder.NAME, (p, c) -> ParsedBinaryRange.fromXContent(p, (String) c));
 		map.put(TopHitsAggregationBuilder.NAME, (p, c) -> ParsedTopHits.fromXContent(p, (String) c));
 		map.put(CompositeAggregationBuilder.NAME, (p, c) -> ParsedComposite.fromXContent(p, (String) c));
+		map.put(StringStatsAggregationBuilder.NAME, (p, c) -> ParsedStringStats.PARSER.parse(p, (String) c));
+		map.put(TopMetricsAggregationBuilder.NAME, (p, c) -> ParsedTopMetrics.PARSER.parse(p, (String) c));
+		map.put(InferencePipelineAggregationBuilder.NAME, (p, c) -> ParsedInference.fromXContent(p, (String) (c)));
 		List<NamedXContentRegistry.Entry> entries = map.entrySet().stream().map(
 				entry -> new NamedXContentRegistry.Entry(Aggregation.class, new ParseField(entry.getKey()), entry.getValue()))
 				.collect(Collectors.toList());

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

@@ -419,7 +419,7 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
 		Assert.notNull(query.getId(), "No document id defined for MoreLikeThisQuery");
 
 		MoreLikeThisQueryBuilder moreLikeThisQueryBuilder = requestFactory.moreLikeThisQueryBuilder(query, index);
-		return search(new NativeSearchQueryBuilder().withQuery(moreLikeThisQueryBuilder).build(), clazz, index);
+		return search(new NativeSearchQueryBuilder().withQuery(moreLikeThisQueryBuilder).withPageable(query.getPageable()).build(), clazz, index);
 	}
 
 	@Override

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

@@ -19,7 +19,6 @@ import org.springframework.data.convert.EntityConverter;
 import org.springframework.data.elasticsearch.core.document.Document;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
-import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
 import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.projection.ProjectionFactory;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
@@ -64,7 +63,13 @@ public interface ElasticsearchConverter
 			return idValue.toString();
 		}
 
-		return getConversionService().convert(idValue, String.class);
+		String converted = getConversionService().convert(idValue, String.class);
+
+		if (converted == null) {
+			return idValue.toString();
+		}
+
+		return converted;
 	}
 
 	/**
@@ -86,29 +91,15 @@ public interface ElasticsearchConverter
 
 	// region query
 	/**
-	 * Updates a {@link CriteriaQuery} by renaming the property names in the query to the correct mapped field names and
-	 * the values to the converted values if the {@link ElasticsearchPersistentProperty} for a property has a
+	 * Updates a {@link Query} by renaming the property names in the query to the correct mapped field names and the
+	 * values to the converted values if the {@link ElasticsearchPersistentProperty} for a property has a
 	 * {@link org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentPropertyConverter}. If
-	 * domainClass is null or query is not a {@link CriteriaQuery}, it's a noop.
+	 * domainClass is null it's a noop.
 	 *
-	 * @param query the query that is internally updated
+	 * @param query the query that is internally updated, must not be {@literal null}
 	 * @param domainClass the class of the object that is searched with the query
 	 */
-	default void updateQuery(Query query, @Nullable Class<?> domainClass) {
+	void updateQuery(Query query, @Nullable Class<?> domainClass);
 
-		if (domainClass != null && query instanceof CriteriaQuery) {
-			updateCriteriaQuery((CriteriaQuery) query, domainClass);
-		}
-	}
-
-	/**
-	 * Updates a {@link CriteriaQuery} by renaming the property names in the query to the correct mapped field names and
-	 * the values to the converted values if the {@link ElasticsearchPersistentProperty} for a property has a
-	 * {@link org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentPropertyConverter}.
-	 *
-	 * @param criteriaQuery the query that is internally updated, must not be {@literal null}
-	 * @param domainClass the class of the object that is searched with the query, must not be {@literal null}
-	 */
-	void updateCriteriaQuery(CriteriaQuery criteriaQuery, Class<?> domainClass);
 	// endregion
 }

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

@@ -42,8 +42,11 @@ import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersiste
 import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentPropertyConverter;
 import org.springframework.data.elasticsearch.core.query.Criteria;
 import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
+import org.springframework.data.elasticsearch.core.query.FetchSourceFilter;
 import org.springframework.data.elasticsearch.core.query.Field;
+import org.springframework.data.elasticsearch.core.query.Query;
 import org.springframework.data.elasticsearch.core.query.SeqNoPrimaryTerm;
+import org.springframework.data.elasticsearch.core.query.SourceFilter;
 import org.springframework.data.mapping.MappingException;
 import org.springframework.data.mapping.PersistentPropertyAccessor;
 import org.springframework.data.mapping.PreferredConstructor;
@@ -1024,7 +1027,61 @@ public class MappingElasticsearchConverter
 
 	// region queries
 	@Override
-	public void updateCriteriaQuery(CriteriaQuery criteriaQuery, Class<?> domainClass) {
+	public void updateQuery(Query query, @Nullable Class<?> domainClass) {
+
+		Assert.notNull(query, "query must not be null");
+
+		if (domainClass != null) {
+
+			updateFieldsAndSourceFilter(query, domainClass);
+
+			if (query instanceof CriteriaQuery) {
+				updateCriteriaQuery((CriteriaQuery) query, domainClass);
+			}
+		}
+	}
+
+	private void updateFieldsAndSourceFilter(Query query, Class<?> domainClass) {
+
+		ElasticsearchPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(domainClass);
+
+		if (persistentEntity != null) {
+			List<String> fields = query.getFields();
+
+			if (!fields.isEmpty()) {
+				query.setFields(updateFieldNames(fields, persistentEntity));
+			}
+
+			SourceFilter sourceFilter = query.getSourceFilter();
+
+			if (sourceFilter != null) {
+
+				String[] includes = null;
+				String[] excludes = null;
+
+				if (sourceFilter.getIncludes() != null) {
+					includes = updateFieldNames(Arrays.asList(sourceFilter.getIncludes()), persistentEntity)
+							.toArray(new String[] {});
+				}
+
+				if (sourceFilter.getExcludes() != null) {
+					excludes = updateFieldNames(Arrays.asList(sourceFilter.getExcludes()), persistentEntity)
+							.toArray(new String[] {});
+				}
+
+				query.addSourceFilter(new FetchSourceFilter(includes, excludes));
+			}
+		}
+	}
+
+	private List<String> updateFieldNames(List<String> fields, ElasticsearchPersistentEntity<?> persistentEntity) {
+		return fields.stream().map(fieldName -> {
+			ElasticsearchPersistentProperty persistentProperty = persistentEntity.getPersistentProperty(fieldName);
+			return persistentProperty != null ? persistentProperty.getFieldName() : fieldName;
+		}).collect(Collectors.toList());
+	}
+
+	private void updateCriteriaQuery(CriteriaQuery criteriaQuery, Class<?> domainClass) {
 
 		Assert.notNull(criteriaQuery, "criteriaQuery must not be null");
 		Assert.notNull(domainClass, "domainClass must not be null");

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

@@ -245,6 +245,7 @@ public class MappingBuilder {
 		Field fieldAnnotation = property.findAnnotation(Field.class);
 		boolean isCompletionProperty = property.isCompletionProperty();
 		boolean isNestedOrObjectProperty = isNestedOrObjectProperty(property);
+		DynamicMapping dynamicMapping = property.findAnnotation(DynamicMapping.class);
 
 		if (!isCompletionProperty && property.isEntity() && hasRelevantAnnotation(property)) {
 
@@ -259,7 +260,7 @@ public class MappingBuilder {
 						: null;
 
 				mapEntity(builder, persistentEntity, false, property.getFieldName(), true, fieldAnnotation.type(),
-						fieldAnnotation, property.findAnnotation(DynamicMapping.class));
+						fieldAnnotation, dynamicMapping);
 				return;
 			}
 		}
@@ -274,9 +275,9 @@ public class MappingBuilder {
 		if (isRootObject && fieldAnnotation != null && property.isIdProperty()) {
 			applyDefaultIdFieldMapping(builder, property);
 		} else if (multiField != null) {
-			addMultiFieldMapping(builder, property, multiField, isNestedOrObjectProperty);
+			addMultiFieldMapping(builder, property, multiField, isNestedOrObjectProperty, dynamicMapping);
 		} else if (fieldAnnotation != null) {
-			addSingleFieldMapping(builder, property, fieldAnnotation, isNestedOrObjectProperty);
+			addSingleFieldMapping(builder, property, fieldAnnotation, isNestedOrObjectProperty, dynamicMapping);
 		}
 	}
 
@@ -377,7 +378,7 @@ public class MappingBuilder {
 	 * @throws IOException
 	 */
 	private void addSingleFieldMapping(XContentBuilder builder, ElasticsearchPersistentProperty property,
-			Field annotation, boolean nestedOrObjectField) throws IOException {
+			Field annotation, boolean nestedOrObjectField, @Nullable DynamicMapping dynamicMapping) throws IOException {
 
 		// build the property json, if empty skip it as this is no valid mapping
 		XContentBuilder propertyBuilder = jsonBuilder().startObject();
@@ -389,6 +390,11 @@ public class MappingBuilder {
 		}
 
 		builder.startObject(property.getFieldName());
+
+		if (nestedOrObjectField && dynamicMapping != null) {
+			builder.field(TYPE_DYNAMIC, dynamicMapping.value().name().toLowerCase());
+		}
+
 		addFieldMappingParameters(builder, annotation, nestedOrObjectField);
 		builder.endObject();
 	}
@@ -429,10 +435,15 @@ public class MappingBuilder {
 	 * @throws IOException
 	 */
 	private void addMultiFieldMapping(XContentBuilder builder, ElasticsearchPersistentProperty property,
-			MultiField annotation, boolean nestedOrObjectField) throws IOException {
+			MultiField annotation, boolean nestedOrObjectField, @Nullable DynamicMapping dynamicMapping) throws IOException {
 
 		// main field
 		builder.startObject(property.getFieldName());
+
+		if (nestedOrObjectField && dynamicMapping != null) {
+			builder.field(TYPE_DYNAMIC, dynamicMapping.value().name().toLowerCase());
+		}
+
 		addFieldMappingParameters(builder, annotation.mainField(), nestedOrObjectField);
 
 		// inner fields

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

@@ -96,6 +96,15 @@ abstract class AbstractQuery implements Query {
 		return fields;
 	}
 
+	@Override
+	public void setFields(List<String> fields) {
+
+		Assert.notNull(fields, "fields must not be null");
+
+		this.fields.clear();
+		this.fields.addAll(fields);
+	}
+
 	@Override
 	public void addSourceFilter(SourceFilter sourceFilter) {
 		this.sourceFilter = sourceFilter;

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

@@ -23,6 +23,7 @@ import java.util.List;
 
 import org.springframework.data.domain.Pageable;
 import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
 
 /**
  * MoreLikeThisQuery
@@ -176,6 +177,9 @@ public class MoreLikeThisQuery {
 	}
 
 	public void setPageable(Pageable pageable) {
+
+		Assert.notNull(pageable, "pageable must not be null");
+
 		this.pageable = pageable;
 	}
 }

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

@@ -103,6 +103,13 @@ public interface Query {
 	 */
 	List<String> getFields();
 
+	/**
+	 * Set fields to be returned as part of search request
+	 * @param fields must not be {@literal null}
+	 * @since 4.2.1
+	 */
+	void setFields(List<String> fields);
+
 	/**
 	 * Add source filter to be added as part of search request
 	 *

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

@@ -15,9 +15,6 @@
  */
 package org.springframework.data.elasticsearch.repository.query;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
@@ -26,11 +23,11 @@ import org.springframework.data.elasticsearch.core.SearchHits;
 import org.springframework.data.elasticsearch.core.convert.DateTimeConverters;
 import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
 import org.springframework.data.elasticsearch.core.query.StringQuery;
+import org.springframework.data.elasticsearch.repository.support.StringQueryUtil;
 import org.springframework.data.repository.query.ParametersParameterAccessor;
 import org.springframework.data.util.StreamUtils;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
-import org.springframework.util.NumberUtils;
 
 /**
  * ElasticsearchStringQuery
@@ -43,25 +40,8 @@ import org.springframework.util.NumberUtils;
  */
 public class ElasticsearchStringQuery extends AbstractElasticsearchRepositoryQuery {
 
-	private static final Pattern PARAMETER_PLACEHOLDER = Pattern.compile("\\?(\\d+)");
 	private String query;
 
-	private final GenericConversionService conversionService = new GenericConversionService();
-
-	{
-		if (!conversionService.canConvert(java.util.Date.class, String.class)) {
-			conversionService.addConverter(DateTimeConverters.JavaDateConverter.INSTANCE);
-		}
-		if (ClassUtils.isPresent("org.joda.time.DateTimeZone", ElasticsearchStringQuery.class.getClassLoader())) {
-			if (!conversionService.canConvert(org.joda.time.ReadableInstant.class, String.class)) {
-				conversionService.addConverter(DateTimeConverters.JodaDateTimeConverter.INSTANCE);
-			}
-			if (!conversionService.canConvert(org.joda.time.LocalDateTime.class, String.class)) {
-				conversionService.addConverter(DateTimeConverters.JodaLocalDateTimeConverter.INSTANCE);
-			}
-		}
-	}
-
 	public ElasticsearchStringQuery(ElasticsearchQueryMethod queryMethod, ElasticsearchOperations elasticsearchOperations,
 			String query) {
 		super(queryMethod, elasticsearchOperations);
@@ -97,7 +77,12 @@ public class ElasticsearchStringQuery extends AbstractElasticsearchRepositoryQue
 		} else if (queryMethod.isPageQuery()) {
 			stringQuery.setPageable(accessor.getPageable());
 			SearchHits<?> searchHits = elasticsearchOperations.search(stringQuery, clazz, index);
-			result = SearchHitSupport.searchPageFor(searchHits, stringQuery.getPageable());
+			if (queryMethod.isSearchPageMethod()) {
+				result = SearchHitSupport.searchPageFor(searchHits, stringQuery.getPageable());
+			} else {
+				result = SearchHitSupport
+						.unwrapSearchHits(SearchHitSupport.searchPageFor(searchHits, stringQuery.getPageable()));
+			}
 		} else if (queryMethod.isStreamQuery()) {
 			if (accessor.getPageable().isUnpaged()) {
 				stringQuery.setPageable(PageRequest.of(0, DEFAULT_STREAM_BATCH_SIZE));
@@ -114,35 +99,14 @@ public class ElasticsearchStringQuery extends AbstractElasticsearchRepositoryQue
 			result = elasticsearchOperations.searchOne(stringQuery, clazz, index);
 		}
 
-		return queryMethod.isNotSearchHitMethod() ? SearchHitSupport.unwrapSearchHits(result) : result;
+		return (queryMethod.isNotSearchHitMethod() && queryMethod.isNotSearchPageMethod())
+				? SearchHitSupport.unwrapSearchHits(result)
+				: result;
 	}
 
 	protected StringQuery createQuery(ParametersParameterAccessor parameterAccessor) {
-		String queryString = replacePlaceholders(this.query, parameterAccessor);
+		String queryString = StringQueryUtil.replacePlaceholders(this.query, parameterAccessor);
 		return new StringQuery(queryString);
 	}
 
-	private String replacePlaceholders(String input, ParametersParameterAccessor accessor) {
-
-		Matcher matcher = PARAMETER_PLACEHOLDER.matcher(input);
-		String result = input;
-		while (matcher.find()) {
-
-			String placeholder = Pattern.quote(matcher.group()) + "(?!\\d+)";
-			int index = NumberUtils.parseNumber(matcher.group(1), Integer.class);
-			result = result.replaceAll(placeholder, getParameterWithIndex(accessor, index));
-		}
-		return result;
-	}
-
-	private String getParameterWithIndex(ParametersParameterAccessor accessor, int index) {
-		Object parameter = accessor.getBindableValue(index);
-		if (parameter == null) {
-			return "null";
-		}
-		if (conversionService.canConvert(parameter.getClass(), String.class)) {
-			return conversionService.convert(parameter, String.class);
-		}
-		return parameter.toString();
-	}
 }

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

@@ -15,15 +15,11 @@
  */
 package org.springframework.data.elasticsearch.repository.query;
 
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
 import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.query.StringQuery;
+import org.springframework.data.elasticsearch.repository.support.StringQueryUtil;
 import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.util.NumberUtils;
-import org.springframework.util.ObjectUtils;
 
 /**
  * @author Christoph Strobl
@@ -32,7 +28,6 @@ import org.springframework.util.ObjectUtils;
  */
 public class ReactiveElasticsearchStringQuery extends AbstractReactiveElasticsearchRepositoryQuery {
 
-	private static final Pattern PARAMETER_PLACEHOLDER = Pattern.compile("\\?(\\d+)");
 	private final String query;
 
 	public ReactiveElasticsearchStringQuery(ReactiveElasticsearchQueryMethod queryMethod,
@@ -52,27 +47,10 @@ public class ReactiveElasticsearchStringQuery extends AbstractReactiveElasticsea
 
 	@Override
 	protected StringQuery createQuery(ElasticsearchParameterAccessor parameterAccessor) {
-		String queryString = replacePlaceholders(this.query, parameterAccessor);
+		String queryString = StringQueryUtil.replacePlaceholders(this.query, parameterAccessor);
 		return new StringQuery(queryString);
 	}
 
-	private String replacePlaceholders(String input, ElasticsearchParameterAccessor accessor) {
-
-		Matcher matcher = PARAMETER_PLACEHOLDER.matcher(input);
-		String result = input;
-		while (matcher.find()) {
-
-			String placeholder = Pattern.quote(matcher.group()) + "(?!\\d+)";
-			int index = NumberUtils.parseNumber(matcher.group(1), Integer.class);
-			result = result.replaceAll(placeholder, getParameterWithIndex(accessor, index));
-		}
-		return result;
-	}
-
-	private String getParameterWithIndex(ElasticsearchParameterAccessor accessor, int index) {
-		return ObjectUtils.nullSafeToString(accessor.getBindableValue(index));
-	}
-
 	@Override
 	boolean isCountQuery() {
 		return queryMethod.hasCountQueryAnnotation();

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

@@ -0,0 +1,89 @@
+/*
+ * Copyright 2021 the original author 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.repository.support;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.springframework.core.convert.support.GenericConversionService;
+import org.springframework.data.elasticsearch.core.convert.DateTimeConverters;
+import org.springframework.data.elasticsearch.repository.query.ElasticsearchStringQuery;
+import org.springframework.data.repository.query.ParameterAccessor;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.NumberUtils;
+
+/**
+ * @author Peter-Josef Meisch
+ */
+final public class StringQueryUtil {
+
+	private static final Pattern PARAMETER_PLACEHOLDER = Pattern.compile("\\?(\\d+)");
+	private static final GenericConversionService conversionService = new GenericConversionService();
+
+    {
+        if (!conversionService.canConvert(java.util.Date.class, String.class)) {
+            conversionService.addConverter(DateTimeConverters.JavaDateConverter.INSTANCE);
+        }
+        if (ClassUtils.isPresent("org.joda.time.DateTimeZone", ElasticsearchStringQuery.class.getClassLoader())) {
+            if (!conversionService.canConvert(org.joda.time.ReadableInstant.class, String.class)) {
+                conversionService.addConverter(DateTimeConverters.JodaDateTimeConverter.INSTANCE);
+            }
+            if (!conversionService.canConvert(org.joda.time.LocalDateTime.class, String.class)) {
+                conversionService.addConverter(DateTimeConverters.JodaLocalDateTimeConverter.INSTANCE);
+            }
+        }
+    }
+
+    private StringQueryUtil() {}
+
+	public static String replacePlaceholders(String input, ParameterAccessor accessor) {
+
+		Matcher matcher = PARAMETER_PLACEHOLDER.matcher(input);
+		String result = input;
+		while (matcher.find()) {
+
+			String placeholder = Pattern.quote(matcher.group()) + "(?!\\d+)";
+			int index = NumberUtils.parseNumber(matcher.group(1), Integer.class);
+			result = result.replaceAll(placeholder, Matcher.quoteReplacement(getParameterWithIndex(accessor, index)));
+		}
+		return result;
+	}
+
+	private static String getParameterWithIndex(ParameterAccessor accessor, int index) {
+
+		Object parameter = accessor.getBindableValue(index);
+		String parameterValue = "null";
+
+		// noinspection ConstantConditions
+		if (parameter != null) {
+
+			if (conversionService.canConvert(parameter.getClass(), String.class)) {
+				String converted = conversionService.convert(parameter, String.class);
+
+				if (converted != null) {
+					parameterValue = converted;
+				}
+			} else {
+				parameterValue = parameter.toString();
+			}
+		}
+
+		parameterValue = parameterValue.replaceAll("\"", Matcher.quoteReplacement("\\\""));
+		return parameterValue;
+
+	}
+
+}

src/main/resources/changelog.txt

@@ -1,6 +1,38 @@
 Spring Data Elasticsearch Changelog
 ===================================
 
+Changes in version 4.2.2 (2021-06-22)
+-------------------------------------
+* #1834 - TopMetricsAggregation NamedObjectNotFoundException: unknown field [top_metrics].
+
+
+Changes in version 4.1.10 (2021-06-22)
+--------------------------------------
+* #1843 - Pageable results and @Query annotation.
+* #1834 - TopMetricsAggregation NamedObjectNotFoundException: unknown field [top_metrics].
+
+
+Changes in version 4.2.1 (2021-05-14)
+-------------------------------------
+* #1811 - StringQuery execution crashes on return type `SearchPage<T>`.
+* #1805 - Upgrade to Elasticsearch 7.12.1.
+* #1794 - Refactor `DefaultReactiveElasticsearchClient` to do request customization with the `WebClient`.
+* #1790 - Custom Query with string parameter which contains double quotes.
+* #1787 - Search with MoreLikeThisQuery should use Pageable.
+* #1785 - Fix documentation about auditing.
+* #1778 - Custom property names must be used in SourceFilter and source fields.
+* #1767 - DynamicMapping annotation should be applicable to any object field.
+
+
+Changes in version 4.1.9 (2021-05-14)
+-------------------------------------
+* #1811 - StringQuery execution crashes on return type `SearchPage<T>`.
+* #1790 - Custom Query with string parameter which contains double quotes.
+* #1787 - Search with MoreLikeThisQuery should use Pageable.
+* #1785 - Fix documentation about auditing.
+* #1767 - DynamicMapping annotation should be applicable to any object field.
+
+
 Changes in version 4.2.0 (2021-04-14)
 -------------------------------------
 * #1771 - Remove `@Persistent` from entity-scan include filters.
@@ -1598,6 +1630,10 @@ Release Notes - Spring Data Elasticsearch - Version 1.0 M1 (2014-02-07)
 
 
 
+
+
+
+
 
 
 

src/main/resources/notice.txt

@@ -1,4 +1,4 @@
-Spring Data Elasticsearch 4.2 GA (2021.0.0)
+Spring Data Elasticsearch 4.2.2 (2021.0.2)
 Copyright (c) [2013-2021] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -26,4 +26,6 @@ conditions of the subcomponent's license, as noted in the LICENSE file.
 
 
 
+
+
 

src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveMockClientTestsUtils.java

@@ -83,10 +83,10 @@ public class ReactiveMockClientTestsUtils {
 
 		if (hosts.length == 1) {
 			// noinspection unchecked
-			delegate = (T) new SingleNodeHostProvider(clientProvider, HttpHeaders::new, getInetSocketAddress(hosts[0])) {};
+			delegate = (T) new SingleNodeHostProvider(clientProvider, getInetSocketAddress(hosts[0])) {};
 		} else {
 			// noinspection unchecked
-			delegate = (T) new MultiNodeHostProvider(clientProvider, HttpHeaders::new, Arrays.stream(hosts)
+			delegate = (T) new MultiNodeHostProvider(clientProvider, Arrays.stream(hosts)
 					.map(ReactiveMockClientTestsUtils::getInetSocketAddress).toArray(InetSocketAddress[]::new)) {};
 		}
 
@@ -297,6 +297,11 @@ public class ReactiveMockClientTestsUtils {
 			throw new UnsupportedOperationException("not implemented");
 		}
 
+		@Override
+		public WebClientProvider withRequestConfigurer(Consumer<WebClient.RequestHeadersSpec<?>> requestConfigurer) {
+			throw new UnsupportedOperationException("not implemented");
+		}
+
 		public Send when(String host) {
 			InetSocketAddress inetSocketAddress = getInetSocketAddress(host);
 			return new CallbackImpl(get(host), headersUriSpecMap.get(inetSocketAddress),

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

@@ -15,7 +15,6 @@
  */
 package org.springframework.data.elasticsearch.core;
 
-import static org.assertj.core.api.Assertions.*;
 import static org.skyscreamer.jsonassert.JSONAssert.*;
 
 import java.time.LocalDate;
@@ -25,6 +24,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Objects;
 
+import org.assertj.core.api.SoftAssertions;
 import org.json.JSONException;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -44,6 +44,9 @@ import org.springframework.data.elasticsearch.core.geo.GeoJsonPoint;
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
 import org.springframework.data.elasticsearch.core.query.Criteria;
 import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
+import org.springframework.data.elasticsearch.core.query.FetchSourceFilter;
+import org.springframework.data.elasticsearch.core.query.Query;
+import org.springframework.data.elasticsearch.core.query.SourceFilter;
 import org.springframework.lang.Nullable;
 
 /**
@@ -356,9 +359,7 @@ public class CriteriaQueryMappingUnitTests {
 				"  }\n" + //
 				"}\n"; //
 
-		CriteriaQuery criteriaQuery = new CriteriaQuery(
-				new Criteria("persons.birthDate").is(LocalDate.of(1999, 10, 3))
-		);
+		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("persons.birthDate").is(LocalDate.of(1999, 10, 3)));
 		mappingElasticsearchConverter.updateQuery(criteriaQuery, House.class);
 		String queryString = new CriteriaQueryProcessor().createQuery(criteriaQuery.getCriteria()).toString();
 
@@ -389,9 +390,7 @@ public class CriteriaQueryMappingUnitTests {
 				"  }\n" + //
 				"}\n"; //
 
-		CriteriaQuery criteriaQuery = new CriteriaQuery(
-				new Criteria("persons.nickName.keyword").is("Foobar")
-		);
+		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("persons.nickName.keyword").is("Foobar"));
 		mappingElasticsearchConverter.updateQuery(criteriaQuery, House.class);
 		String queryString = new CriteriaQueryProcessor().createQuery(criteriaQuery.getCriteria()).toString();
 
@@ -417,14 +416,33 @@ public class CriteriaQueryMappingUnitTests {
 				"  }\n" + //
 				"}\n"; //
 
-		CriteriaQuery criteriaQuery = new CriteriaQuery(
-				new Criteria("persons.birthDate").is(LocalDate.of(1999, 10, 3))
-		);
+		CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("persons.birthDate").is(LocalDate.of(1999, 10, 3)));
 		mappingElasticsearchConverter.updateQuery(criteriaQuery, ObjectWithPerson.class);
 		String queryString = new CriteriaQueryProcessor().createQuery(criteriaQuery.getCriteria()).toString();
 
 		assertEquals(expected, queryString, false);
 	}
+
+	@Test // #1778
+	@DisplayName("should map names in source fields and SourceFilters")
+	void shouldMapNamesInSourceFieldsAndSourceFilters() {
+
+		Query query = Query.findAll();
+		// Note: we don't care if these filters make sense here, this test is only about name mapping
+		query.addFields("firstName", "lastName");
+		query.addSourceFilter(new FetchSourceFilter(new String[] { "firstName" }, new String[] { "lastName" }));
+
+		mappingElasticsearchConverter.updateQuery(query, Person.class);
+
+		SoftAssertions softly = new SoftAssertions();
+		softly.assertThat(query.getFields()).containsExactly("first-name", "last-name");
+		SourceFilter sourceFilter = query.getSourceFilter();
+		softly.assertThat(sourceFilter).isNotNull();
+		softly.assertThat(sourceFilter.getIncludes()).containsExactly("first-name");
+		softly.assertThat(sourceFilter.getExcludes()).containsExactly("last-name");
+		softly.assertAll();
+	}
+
 	// endregion
 
 	// region helper functions
@@ -442,7 +460,8 @@ public class CriteriaQueryMappingUnitTests {
 		@Nullable @Id String id;
 		@Nullable @Field(name = "first-name") String firstName;
 		@Nullable @Field(name = "last-name") String lastName;
-		@Nullable @MultiField(mainField = @Field(name="nick-name"), otherFields = {@InnerField(suffix = "keyword", type = FieldType.Keyword)}) String nickName;
+		@Nullable @MultiField(mainField = @Field(name = "nick-name"),
+				otherFields = { @InnerField(suffix = "keyword", type = FieldType.Keyword) }) String nickName;
 		@Nullable @Field(name = "created-date", type = FieldType.Date, format = DateFormat.epoch_millis) Date createdDate;
 		@Nullable @Field(name = "birth-date", type = FieldType.Date, format = {},
 				pattern = "dd.MM.uuuu") LocalDate birthDate;
@@ -450,16 +469,12 @@ public class CriteriaQueryMappingUnitTests {
 
 	static class House {
 		@Nullable @Id String id;
-		@Nullable
-		@Field(name = "per-sons", type = FieldType.Nested)
-		List<Person> persons;
+		@Nullable @Field(name = "per-sons", type = FieldType.Nested) List<Person> persons;
 	}
 
 	static class ObjectWithPerson {
 		@Nullable @Id String id;
-		@Nullable
-		@Field(name = "per-sons", type = FieldType.Object)
-		List<Person> persons;
+		@Nullable @Field(name = "per-sons", type = FieldType.Object) List<Person> persons;
 	}
 
 	static class GeoShapeEntity {

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

@@ -1116,6 +1116,49 @@ public abstract class ElasticsearchTemplateTests {
 		assertThat(content).contains(sampleEntity);
 	}
 
+	@Test // #1787
+	@DisplayName("should use Pageable on MoreLikeThis queries")
+	void shouldUsePageableOnMoreLikeThisQueries() {
+
+		String sampleMessage = "So we build a web site or an application and want to add search to it, "
+				+ "and then it hits us: getting search working is hard. We want our search solution to be fast,"
+				+ " we want a painless setup and a completely free search schema, we want to be able to index data simply using JSON over HTTP, "
+				+ "we want our search server to be always available, we want to be able to start with one machine and scale to hundreds, "
+				+ "we want real-time search, we want simple multi-tenancy, and we want a solution that is built for the cloud.";
+		String referenceId = nextIdAsString();
+		Collection<String> ids = IntStream.rangeClosed(1, 10).mapToObj(i -> nextIdAsString()).collect(Collectors.toList());
+		ids.add(referenceId);
+		ids.stream()
+				.map(id -> getIndexQuery(SampleEntity.builder().id(id).message(sampleMessage).version(System.currentTimeMillis()).build()))
+				.forEach(indexQuery -> operations.index(indexQuery, index));
+		indexOperations.refresh();
+
+		MoreLikeThisQuery moreLikeThisQuery = new MoreLikeThisQuery();
+		moreLikeThisQuery.setId(referenceId);
+		moreLikeThisQuery.addFields("message");
+		moreLikeThisQuery.setMinDocFreq(1);
+		moreLikeThisQuery.setPageable(PageRequest.of(0, 5));
+
+		SearchHits<SampleEntity> searchHits = operations.search(moreLikeThisQuery, SampleEntity.class, index);
+
+		assertThat(searchHits.getTotalHits()).isEqualTo(10);
+		assertThat(searchHits.getSearchHits()).hasSize(5);
+
+		Collection<String> returnedIds = searchHits.getSearchHits().stream().map(SearchHit::getId).collect(Collectors.toList());
+
+		moreLikeThisQuery.setPageable(PageRequest.of(1, 5));
+
+		searchHits = operations.search(moreLikeThisQuery, SampleEntity.class, index);
+
+		assertThat(searchHits.getTotalHits()).isEqualTo(10);
+		assertThat(searchHits.getSearchHits()).hasSize(5);
+
+		searchHits.getSearchHits().stream().map(SearchHit::getId).forEach(returnedIds::add);
+
+		assertThat(returnedIds).hasSize(10);
+		assertThat(ids).containsAll(returnedIds);
+	}
+
 	@Test // DATAES-167
 	public void shouldReturnResultsWithScanAndScrollForGivenCriteriaQuery() {
 
@@ -3751,6 +3794,7 @@ public abstract class ElasticsearchTemplateTests {
 		assertThat(explanation).isNotNull();
 	}
 
+	// region entities
 	@Document(indexName = INDEX_NAME_SAMPLE_ENTITY)
 	@Setting(shards = 1, replicas = 0, refreshInterval = "-1")
 	static class SampleEntity {
@@ -4528,4 +4572,5 @@ public abstract class ElasticsearchTemplateTests {
 			this.text = text;
 		}
 	}
+	//endregion
 }

src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderIntegrationTests.java

@@ -296,6 +296,16 @@ public class MappingBuilderIntegrationTests extends MappingContextBaseTests {
 		indexOps.delete();
 	}
 
+	@Test // #1767
+	@DisplayName("should write dynamic mapping entries")
+	void shouldWriteDynamicMappingEntries() {
+
+		IndexOperations indexOps = operations.indexOps(DynamicMappingEntity.class);
+		indexOps.create();
+		indexOps.putMapping();
+		indexOps.delete();
+	}
+
 	@Document(indexName = "ignore-above-index")
 	static class IgnoreAboveEntity {
 		@Nullable @Id private String id;
@@ -1082,4 +1092,25 @@ public class MappingBuilderIntegrationTests extends MappingContextBaseTests {
 			this.dense_vector = dense_vector;
 		}
 	}
+
+	@Document(indexName = "dynamic-mapping")
+	@DynamicMapping(DynamicMappingValue.False)
+	static class DynamicMappingEntity {
+
+		@Nullable @DynamicMapping(DynamicMappingValue.Strict) @Field(type = FieldType.Object) private Author author;
+		@Nullable @DynamicMapping(DynamicMappingValue.False) @Field(
+				type = FieldType.Object) private Map<String, Object> objectMap;
+		@Nullable @DynamicMapping(DynamicMappingValue.False) @Field(
+				type = FieldType.Nested) private List<Map<String, Object>> nestedObjectMap;
+
+		@Nullable
+		public Author getAuthor() {
+			return author;
+		}
+
+		public void setAuthor(Author author) {
+			this.author = author;
+		}
+	}
+
 }

src/test/java/org/springframework/data/elasticsearch/core/index/MappingBuilderUnitTests.java

@@ -31,6 +31,7 @@ import java.time.LocalDateTime;
 import java.util.Collection;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.elasticsearch.search.suggest.completion.context.ContextMapping;
@@ -415,23 +416,42 @@ public class MappingBuilderUnitTests extends MappingContextBaseTests {
 		assertEquals(expected, mapping, false);
 	}
 
-	@Test
+	@Test // DATAES-148, #1767
 	void shouldWriteDynamicMappingSettings() throws JSONException {
 
 		String expected = "{\n" + //
-				"    \"dynamic\": \"false\",\n" + //
-				"    \"properties\": {\n" + //
-				"      \"author\": {\n" + //
-				"        \"dynamic\": \"strict\",\n" + //
-				"        \"type\": \"object\",\n" + //
-				"        \"properties\": {}\n" + //
+				"  \"dynamic\": \"false\",\n" + //
+				"  \"properties\": {\n" + //
+				"    \"_class\": {\n" + //
+				"      \"type\": \"keyword\",\n" + //
+				"      \"index\": false,\n" + //
+				"      \"doc_values\": false\n" + //
+				"    },\n" + //
+				"    \"author\": {\n" + //
+				"      \"type\": \"object\",\n" + //
+				"      \"dynamic\": \"strict\",\n" + //
+				"      \"properties\": {\n" + //
+				"        \"_class\": {\n" + //
+				"          \"type\": \"keyword\",\n" + //
+				"          \"index\": false,\n" + //
+				"          \"doc_values\": false\n" + //
+				"        }\n" + //
 				"      }\n" + //
+				"    },\n" + //
+				"    \"objectMap\": {\n" + //
+				"      \"type\": \"object\",\n" + //
+				"      \"dynamic\": \"false\"\n" + //
+				"    },\n" + //
+				"    \"nestedObjectMap\": {\n" + //
+				"      \"type\": \"nested\",\n" + //
+				"      \"dynamic\": \"false\"\n" + //
 				"    }\n" + //
-				"}\n";
+				"  }\n" + //
+				"}"; //
 
 		String mapping = getMappingBuilder().buildPropertyMapping(ConfigureDynamicMappingEntity.class);
 
-		assertEquals(expected, mapping, false);
+		assertEquals(expected, mapping, true);
 	}
 
 	@Test // DATAES-784
@@ -608,39 +628,38 @@ public class MappingBuilderUnitTests extends MappingContextBaseTests {
 		assertEquals(expected, mapping, false);
 	}
 
-    @Test // #1727
-    @DisplayName("should map according to the annotated properties")
-    void shouldMapAccordingToTheAnnotatedProperties() throws JSONException {
+	@Test // #1727
+	@DisplayName("should map according to the annotated properties")
+	void shouldMapAccordingToTheAnnotatedProperties() throws JSONException {
 
-	    String expected = "{\n" +
-            "    \"properties\": {\n" + //
-            "        \"field1\": {\n" + //
-            "            \"type\": \"date\",\n" + //
-            "            \"format\": \"date_optional_time||epoch_millis\"\n" + //
-            "        },\n" + //
-            "        \"field2\": {\n" + //
-            "            \"type\": \"date\",\n" + //
-            "            \"format\": \"basic_date\"\n" + //
-            "        },\n" + //
-            "        \"field3\": {\n" + //
-            "            \"type\": \"date\",\n" + //
-            "            \"format\": \"basic_date||basic_time\"\n" + //
-            "        },\n" + //
-            "        \"field4\": {\n" + //
-            "            \"type\": \"date\",\n" + //
-            "            \"format\": \"date_optional_time||epoch_millis||dd.MM.uuuu\"\n" + //
-            "        },\n" + //
-            "        \"field5\": {\n" + //
-            "            \"type\": \"date\",\n" + //
-            "            \"format\": \"dd.MM.uuuu\"\n" + //
-            "        }\n" + //
-            "    }\n" + //
-            "}"; //
+		String expected = "{\n" + "    \"properties\": {\n" + //
+				"        \"field1\": {\n" + //
+				"            \"type\": \"date\",\n" + //
+				"            \"format\": \"date_optional_time||epoch_millis\"\n" + //
+				"        },\n" + //
+				"        \"field2\": {\n" + //
+				"            \"type\": \"date\",\n" + //
+				"            \"format\": \"basic_date\"\n" + //
+				"        },\n" + //
+				"        \"field3\": {\n" + //
+				"            \"type\": \"date\",\n" + //
+				"            \"format\": \"basic_date||basic_time\"\n" + //
+				"        },\n" + //
+				"        \"field4\": {\n" + //
+				"            \"type\": \"date\",\n" + //
+				"            \"format\": \"date_optional_time||epoch_millis||dd.MM.uuuu\"\n" + //
+				"        },\n" + //
+				"        \"field5\": {\n" + //
+				"            \"type\": \"date\",\n" + //
+				"            \"format\": \"dd.MM.uuuu\"\n" + //
+				"        }\n" + //
+				"    }\n" + //
+				"}"; //
 
-        String mapping = getMappingBuilder().buildPropertyMapping(DateFormatsEntity.class);
+		String mapping = getMappingBuilder().buildPropertyMapping(DateFormatsEntity.class);
 
-        assertEquals(expected, mapping, false);
-    }
+		assertEquals(expected, mapping, false);
+	}
 
 	@Document(indexName = "ignore-above-index")
 	static class IgnoreAboveEntity {
@@ -666,7 +685,6 @@ public class MappingBuilderUnitTests extends MappingContextBaseTests {
 		}
 	}
 
-
 	static class FieldNameEntity {
 
 		@Document(indexName = "fieldname-index")
@@ -1199,6 +1217,10 @@ public class MappingBuilderUnitTests extends MappingContextBaseTests {
 	static class ConfigureDynamicMappingEntity {
 
 		@Nullable @DynamicMapping(DynamicMappingValue.Strict) @Field(type = FieldType.Object) private Author author;
+		@Nullable @DynamicMapping(DynamicMappingValue.False) @Field(
+				type = FieldType.Object) private Map<String, Object> objectMap;
+		@Nullable @DynamicMapping(DynamicMappingValue.False) @Field(
+				type = FieldType.Nested) private List<Map<String, Object>> nestedObjectMap;
 
 		@Nullable
 		public Author getAuthor() {
@@ -1474,7 +1496,8 @@ public class MappingBuilderUnitTests extends MappingContextBaseTests {
 		@Nullable @Id private String id;
 		@Nullable @Field(type = FieldType.Date) private LocalDateTime field1;
 		@Nullable @Field(type = FieldType.Date, format = DateFormat.basic_date) private LocalDateTime field2;
-		@Nullable @Field(type = FieldType.Date, format = { DateFormat.basic_date, DateFormat.basic_time }) private LocalDateTime field3;
+		@Nullable @Field(type = FieldType.Date,
+				format = { DateFormat.basic_date, DateFormat.basic_time }) private LocalDateTime field3;
 		@Nullable @Field(type = FieldType.Date, pattern = "dd.MM.uuuu") private LocalDateTime field4;
 		@Nullable @Field(type = FieldType.Date, format = {}, pattern = "dd.MM.uuuu") private LocalDateTime field5;
 

src/test/java/org/springframework/data/elasticsearch/repositories/custommethod/CustomMethodRepositoryBaseTests.java

@@ -1593,11 +1593,27 @@ public abstract class CustomMethodRepositoryBaseTests {
 		assertThat((nextPageable.getPageNumber())).isEqualTo(1);
 	}
 
+	@Test // #1811
+	@DisplayName("should return SearchPage with query")
+	void shouldReturnSearchPageWithQuery() {
+		List<SampleEntity> entities = createSampleEntities("abc", 20);
+		repository.saveAll(entities);
+
+		SearchPage<SampleEntity> searchPage = repository.searchWithQueryByMessage("Message", PageRequest.of(0, 10));
+
+		assertThat(searchPage).isNotNull();
+		SearchHits<SampleEntity> searchHits = searchPage.getSearchHits();
+		assertThat(searchHits).isNotNull();
+		assertThat((searchHits.getTotalHits())).isEqualTo(20);
+		assertThat(searchHits.getSearchHits()).hasSize(10);
+		Pageable nextPageable = searchPage.nextPageable();
+		assertThat((nextPageable.getPageNumber())).isEqualTo(1);
+	}
+
 	private List<SampleEntity> createSampleEntities(String type, int numberOfEntities) {
 
 		List<SampleEntity> entities = new ArrayList<>();
 		for (int i = 0; i < numberOfEntities; i++) {
-
 			SampleEntity entity = new SampleEntity();
 			entity.setId(UUID.randomUUID().toString());
 			entity.setAvailable(true);
@@ -1633,8 +1649,7 @@ public abstract class CustomMethodRepositoryBaseTests {
 
 	@Document(indexName = "test-index-sample-repositories-custom-method")
 	static class SampleEntity {
-		@Nullable
-		@Id private String id;
+		@Nullable @Id private String id;
 		@Nullable @Field(type = Text, store = true, fielddata = true) private String type;
 		@Nullable @Field(type = Text, store = true, fielddata = true) private String message;
 		@Nullable @Field(type = Keyword) private String keyword;
@@ -1836,6 +1851,9 @@ public abstract class CustomMethodRepositoryBaseTests {
 
 		SearchPage<SampleEntity> searchByMessage(String message, Pageable pageable);
 
+		@Query("{\"match\": {\"message\": \"?0\"}}")
+		SearchPage<SampleEntity> searchWithQueryByMessage(String message, Pageable pageable);
+
 		@CountQuery("{\"bool\" : {\"must\" : {\"term\" : {\"type\" : \"?0\"}}}}")
 		long countWithQueryByType(String type);
 	}

src/test/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchStringQueryUnitTests.java

@@ -25,6 +25,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -37,6 +38,7 @@ import org.springframework.data.elasticsearch.annotations.InnerField;
 import org.springframework.data.elasticsearch.annotations.MultiField;
 import org.springframework.data.elasticsearch.annotations.Query;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.SearchHits;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
@@ -82,6 +84,17 @@ public class ElasticsearchStringQueryUnitTests {
 				.isEqualTo("name:(zero, eleven, one, two, three, four, five, six, seven, eight, nine, ten, eleven, zero, one)");
 	}
 
+	@Test // #1790
+	@DisplayName("should escape Strings in query parameters")
+	void shouldEscapeStringsInQueryParameters() throws Exception {
+
+		org.springframework.data.elasticsearch.core.query.Query query = createQuery("findByPrefix", "hello \"Stranger\"");
+
+		assertThat(query).isInstanceOf(StringQuery.class);
+		assertThat(((StringQuery) query).getSource())
+				.isEqualTo("{\"bool\":{\"must\": [{\"match\": {\"prefix\": {\"name\" : \"hello \\\"Stranger\\\"\"}}]}}");
+	}
+
 	private org.springframework.data.elasticsearch.core.query.Query createQuery(String methodName, String... args)
 			throws NoSuchMethodException {
 
@@ -90,7 +103,6 @@ public class ElasticsearchStringQueryUnitTests {
 		ElasticsearchStringQuery elasticsearchStringQuery = queryForMethod(queryMethod);
 		return elasticsearchStringQuery.createQuery(new ElasticsearchParametersParameterAccessor(queryMethod, args));
 	}
-
 	private ElasticsearchStringQuery queryForMethod(ElasticsearchQueryMethod queryMethod) {
 		return new ElasticsearchStringQuery(queryMethod, operations, queryMethod.getAnnotatedQuery());
 	}
@@ -110,6 +122,9 @@ public class ElasticsearchStringQueryUnitTests {
 		@Query(value = "name:(?0, ?11, ?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?0, ?1)")
 		Person findWithRepeatedPlaceholder(String arg0, String arg1, String arg2, String arg3, String arg4, String arg5,
 				String arg6, String arg7, String arg8, String arg9, String arg10, String arg11);
+
+		@Query("{\"bool\":{\"must\": [{\"match\": {\"prefix\": {\"name\" : \"?0\"}}]}}")
+		SearchHits<Book> findByPrefix(String prefix);
 	}
 
 	/**

src/test/java/org/springframework/data/elasticsearch/repository/query/ReactiveElasticsearchStringQueryUnitTests.java

@@ -29,6 +29,7 @@ import java.util.Map;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
@@ -41,6 +42,7 @@ import org.springframework.data.elasticsearch.annotations.InnerField;
 import org.springframework.data.elasticsearch.annotations.MultiField;
 import org.springframework.data.elasticsearch.annotations.Query;
 import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
+import org.springframework.data.elasticsearch.core.SearchHit;
 import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
 import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
@@ -119,6 +121,17 @@ public class ReactiveElasticsearchStringQueryUnitTests {
 				.isEqualTo("name:(zero, eleven, one, two, three, four, five, six, seven, eight, nine, ten, eleven, zero, one)");
 	}
 
+	@Test // #1790
+	@DisplayName("should escape Strings in query parameters")
+	void shouldEscapeStringsInQueryParameters() throws Exception {
+
+		org.springframework.data.elasticsearch.core.query.Query query = createQuery("findByPrefix", "hello \"Stranger\"");
+
+		assertThat(query).isInstanceOf(StringQuery.class);
+		assertThat(((StringQuery) query).getSource())
+				.isEqualTo("{\"bool\":{\"must\": [{\"match\": {\"prefix\": {\"name\" : \"hello \\\"Stranger\\\"\"}}]}}");
+	}
+
 	private org.springframework.data.elasticsearch.core.query.Query createQuery(String methodName, String... args)
 			throws NoSuchMethodException {
 
@@ -163,6 +176,10 @@ public class ReactiveElasticsearchStringQueryUnitTests {
 		@Query(value = "name:(?0, ?11, ?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?0, ?1)")
 		Person findWithRepeatedPlaceholder(String arg0, String arg1, String arg2, String arg3, String arg4, String arg5,
 				String arg6, String arg7, String arg8, String arg9, String arg10, String arg11);
+
+		@Query("{\"bool\":{\"must\": [{\"match\": {\"prefix\": {\"name\" : \"?0\"}}]}}")
+		Flux<SearchHit<Book>> findByPrefix(String prefix);
+
 	}
 
 	/**