mirror of
https://github.com/spring-projects/spring-data-elasticsearch.git
synced 2025-07-03 01:02:29 +00:00
Compare commits
No commits in common. "main" and "5.5.0-M1" have entirely different histories.
1
.gitignore
vendored
1
.gitignore
vendored
@ -33,4 +33,3 @@ node
|
|||||||
package-lock.json
|
package-lock.json
|
||||||
|
|
||||||
.mvn/.develocity
|
.mvn/.develocity
|
||||||
/src/test/resources/testcontainers-local.properties
|
|
||||||
|
@ -8,7 +8,3 @@
|
|||||||
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
|
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
|
||||||
--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
|
--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED
|
||||||
--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
|
--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED
|
||||||
--add-opens=java.base/java.util=ALL-UNNAMED
|
|
||||||
--add-opens=java.base/java.lang.reflect=ALL-UNNAMED
|
|
||||||
--add-opens=java.base/java.text=ALL-UNNAMED
|
|
||||||
--add-opens=java.desktop/java.awt.font=ALL-UNNAMED
|
|
||||||
|
@ -62,7 +62,7 @@ public class MyService {
|
|||||||
|
|
||||||
=== Using the RestClient
|
=== Using the RestClient
|
||||||
|
|
||||||
Please check the https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/#elasticsearch.clients.configuration[official documentation].
|
Please check the [official documentation](https://docs.spring.io/spring-data/elasticsearch/docs/current/reference/html/#elasticsearch.clients.configuration).
|
||||||
|
|
||||||
=== Maven configuration
|
=== Maven configuration
|
||||||
|
|
||||||
|
@ -1,20 +1,25 @@
|
|||||||
# Java versions
|
# Java versions
|
||||||
java.main.tag=24.0.1_9-jdk-noble
|
java.main.tag=17.0.13_11-jdk-focal
|
||||||
java.next.tag=24.0.1_9-jdk-noble
|
java.next.tag=23.0.1_11-jdk-noble
|
||||||
|
|
||||||
# Docker container images - standard
|
# Docker container images - standard
|
||||||
docker.java.main.image=library/eclipse-temurin:${java.main.tag}
|
docker.java.main.image=library/eclipse-temurin:${java.main.tag}
|
||||||
docker.java.next.image=library/eclipse-temurin:${java.next.tag}
|
docker.java.next.image=library/eclipse-temurin:${java.next.tag}
|
||||||
|
|
||||||
# Supported versions of MongoDB
|
# Supported versions of MongoDB
|
||||||
docker.mongodb.6.0.version=6.0.23
|
docker.mongodb.4.4.version=4.4.25
|
||||||
docker.mongodb.7.0.version=7.0.20
|
docker.mongodb.5.0.version=5.0.21
|
||||||
docker.mongodb.8.0.version=8.0.9
|
docker.mongodb.6.0.version=6.0.10
|
||||||
|
docker.mongodb.7.0.version=7.0.2
|
||||||
|
docker.mongodb.8.0.version=8.0.0
|
||||||
|
|
||||||
# Supported versions of Redis
|
# Supported versions of Redis
|
||||||
docker.redis.6.version=6.2.13
|
docker.redis.6.version=6.2.13
|
||||||
docker.redis.7.version=7.2.4
|
docker.redis.7.version=7.2.4
|
||||||
|
|
||||||
|
# Supported versions of Cassandra
|
||||||
|
docker.cassandra.3.version=3.11.16
|
||||||
|
|
||||||
# Docker environment settings
|
# Docker environment settings
|
||||||
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
|
docker.java.inside.basic=-v $HOME:/tmp/jenkins-home
|
||||||
docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home
|
docker.java.inside.docker=-u root -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v $HOME:/tmp/jenkins-home
|
||||||
|
39
pom.xml
39
pom.xml
@ -5,12 +5,12 @@
|
|||||||
|
|
||||||
<groupId>org.springframework.data</groupId>
|
<groupId>org.springframework.data</groupId>
|
||||||
<artifactId>spring-data-elasticsearch</artifactId>
|
<artifactId>spring-data-elasticsearch</artifactId>
|
||||||
<version>6.0.0-SNAPSHOT</version>
|
<version>5.5.0-M1</version>
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>org.springframework.data.build</groupId>
|
<groupId>org.springframework.data.build</groupId>
|
||||||
<artifactId>spring-data-parent</artifactId>
|
<artifactId>spring-data-parent</artifactId>
|
||||||
<version>4.0.0-SNAPSHOT</version>
|
<version>3.5.0-M1</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<name>Spring Data Elasticsearch</name>
|
<name>Spring Data Elasticsearch</name>
|
||||||
@ -18,10 +18,10 @@
|
|||||||
<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
|
<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<springdata.commons>4.0.0-SNAPSHOT</springdata.commons>
|
<springdata.commons>3.5.0-M1</springdata.commons>
|
||||||
|
|
||||||
<!-- version of the ElasticsearchClient -->
|
<!-- version of the ElasticsearchClient -->
|
||||||
<elasticsearch-java>9.0.3</elasticsearch-java>
|
<elasticsearch-java>8.17.2</elasticsearch-java>
|
||||||
|
|
||||||
<hoverfly>0.19.0</hoverfly>
|
<hoverfly>0.19.0</hoverfly>
|
||||||
<log4j>2.23.1</log4j>
|
<log4j>2.23.1</log4j>
|
||||||
@ -132,27 +132,6 @@
|
|||||||
</exclusions>
|
</exclusions>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<!-- the old RestCLient is an optional dependency for user that still want to use it-->
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.elasticsearch.client</groupId>
|
|
||||||
<artifactId>elasticsearch-rest-client</artifactId>
|
|
||||||
<version>${elasticsearch-java}</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-logging</groupId>
|
|
||||||
<artifactId>commons-logging</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<dependency>
|
|
||||||
<groupId>com.querydsl</groupId>
|
|
||||||
<artifactId>querydsl-core</artifactId>
|
|
||||||
<version>${querydsl}</version>
|
|
||||||
<optional>true</optional>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
<!-- Jackson JSON Mapper -->
|
<!-- Jackson JSON Mapper -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.fasterxml.jackson.core</groupId>
|
<groupId>com.fasterxml.jackson.core</groupId>
|
||||||
@ -471,16 +450,6 @@
|
|||||||
</profiles>
|
</profiles>
|
||||||
|
|
||||||
<repositories>
|
<repositories>
|
||||||
<repository>
|
|
||||||
<id>spring-snapshot</id>
|
|
||||||
<url>https://repo.spring.io/snapshot</url>
|
|
||||||
<snapshots>
|
|
||||||
<enabled>true</enabled>
|
|
||||||
</snapshots>
|
|
||||||
<releases>
|
|
||||||
<enabled>false</enabled>
|
|
||||||
</releases>
|
|
||||||
</repository>
|
|
||||||
<repository>
|
<repository>
|
||||||
<id>spring-milestone</id>
|
<id>spring-milestone</id>
|
||||||
<url>https://repo.spring.io/milestone</url>
|
<url>https://repo.spring.io/milestone</url>
|
||||||
|
@ -12,7 +12,6 @@
|
|||||||
*** xref:migration-guides/migration-guide-5.2-5.3.adoc[]
|
*** xref:migration-guides/migration-guide-5.2-5.3.adoc[]
|
||||||
*** xref:migration-guides/migration-guide-5.3-5.4.adoc[]
|
*** xref:migration-guides/migration-guide-5.3-5.4.adoc[]
|
||||||
*** xref:migration-guides/migration-guide-5.4-5.5.adoc[]
|
*** xref:migration-guides/migration-guide-5.4-5.5.adoc[]
|
||||||
*** xref:migration-guides/migration-guide-5.5-6.0.adoc[]
|
|
||||||
|
|
||||||
|
|
||||||
* xref:elasticsearch.adoc[]
|
* xref:elasticsearch.adoc[]
|
||||||
|
@ -10,7 +10,7 @@ In order for the auditing code to be able to decide whether an entity instance i
|
|||||||
----
|
----
|
||||||
package org.springframework.data.domain;
|
package org.springframework.data.domain;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
public interface Persistable<ID> {
|
public interface Persistable<ID> {
|
||||||
@Nullable
|
@Nullable
|
||||||
|
@ -6,10 +6,10 @@ This chapter illustrates configuration and usage of supported Elasticsearch clie
|
|||||||
Spring Data Elasticsearch operates upon an Elasticsearch client (provided by Elasticsearch client libraries) that is connected to a single Elasticsearch node or a cluster.
|
Spring Data Elasticsearch operates upon an Elasticsearch client (provided by Elasticsearch client libraries) that is connected to a single Elasticsearch node or a cluster.
|
||||||
Although the Elasticsearch Client can be used directly to work with the cluster, applications using Spring Data Elasticsearch normally use the higher level abstractions of xref:elasticsearch/template.adoc[Elasticsearch Operations] and xref:elasticsearch/repositories/elasticsearch-repositories.adoc[Elasticsearch Repositories].
|
Although the Elasticsearch Client can be used directly to work with the cluster, applications using Spring Data Elasticsearch normally use the higher level abstractions of xref:elasticsearch/template.adoc[Elasticsearch Operations] and xref:elasticsearch/repositories/elasticsearch-repositories.adoc[Elasticsearch Repositories].
|
||||||
|
|
||||||
[[elasticsearch.clients.rest5client]]
|
[[elasticsearch.clients.restclient]]
|
||||||
== Imperative Rest5Client
|
== Imperative Rest Client
|
||||||
|
|
||||||
To use the imperative (non-reactive) Rest5Client, a configuration bean must be configured like this:
|
To use the imperative (non-reactive) client, a configuration bean must be configured like this:
|
||||||
|
|
||||||
====
|
====
|
||||||
[source,java]
|
[source,java]
|
||||||
@ -31,81 +31,7 @@ public class MyClientConfig extends ElasticsearchConfiguration {
|
|||||||
<.> for a detailed description of the builder methods see xref:elasticsearch/clients.adoc#elasticsearch.clients.configuration[Client Configuration]
|
<.> for a detailed description of the builder methods see xref:elasticsearch/clients.adoc#elasticsearch.clients.configuration[Client Configuration]
|
||||||
====
|
====
|
||||||
|
|
||||||
The javadoc:org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration[] class allows further configuration by overriding for example the `jsonpMapper()` or `transportOptions()` methods.
|
The javadoc:org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration[]] class allows further configuration by overriding for example the `jsonpMapper()` or `transportOptions()` methods.
|
||||||
|
|
||||||
|
|
||||||
The following beans can then be injected in other Spring components:
|
|
||||||
|
|
||||||
====
|
|
||||||
[source,java]
|
|
||||||
----
|
|
||||||
import org.springframework.beans.factory.annotation.Autowired;@Autowired
|
|
||||||
ElasticsearchOperations operations; <.>
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
ElasticsearchClient elasticsearchClient; <.>
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
Rest5Client rest5Client; <.>
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
JsonpMapper jsonpMapper; <.>
|
|
||||||
----
|
|
||||||
|
|
||||||
<.> an implementation of javadoc:org.springframework.data.elasticsearch.core.ElasticsearchOperations[]
|
|
||||||
<.> the `co.elastic.clients.elasticsearch.ElasticsearchClient` that is used.
|
|
||||||
<.> the low level `Rest5Client` from the Elasticsearch libraries
|
|
||||||
<.> the `JsonpMapper` user by the Elasticsearch `Transport`
|
|
||||||
====
|
|
||||||
|
|
||||||
Basically one should just use the javadoc:org.springframework.data.elasticsearch.core.ElasticsearchOperations[] to interact with the Elasticsearch cluster.
|
|
||||||
When using repositories, this instance is used under the hood as well.
|
|
||||||
|
|
||||||
[[elasticsearch.clients.restclient]]
|
|
||||||
== Deprecated Imperative RestClient
|
|
||||||
|
|
||||||
To use the imperative (non-reactive) RestClient - deprecated since version 6 - , the following dependency needs to be added, adapt the correct version. The exclusion is needed in a Spring Boot application:
|
|
||||||
====
|
|
||||||
[source,xml]
|
|
||||||
----
|
|
||||||
<dependency>
|
|
||||||
<groupId>org.elasticsearch.client</groupId>
|
|
||||||
<artifactId>elasticsearch-rest-client</artifactId>
|
|
||||||
<version>${elasticsearch-client.version}</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>commons-logging</groupId>
|
|
||||||
<artifactId>commons-logging</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
|
||||||
|
|
||||||
----
|
|
||||||
====
|
|
||||||
|
|
||||||
The configuration bean must be configured like this:
|
|
||||||
|
|
||||||
====
|
|
||||||
[source,java]
|
|
||||||
----
|
|
||||||
import org.springframework.data.elasticsearch.client.elc.ElasticsearchLegacyRestClientConfiguration;
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
public class MyClientConfig extends ElasticsearchLegacyRestClientConfiguration {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ClientConfiguration clientConfiguration() {
|
|
||||||
return ClientConfiguration.builder() <.>
|
|
||||||
.connectedTo("localhost:9200")
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
----
|
|
||||||
|
|
||||||
<.> for a detailed description of the builder methods see xref:elasticsearch/clients.adoc#elasticsearch.clients.configuration[Client Configuration]
|
|
||||||
====
|
|
||||||
|
|
||||||
The javadoc:org.springframework.data.elasticsearch.client.elc.ElasticsearchConfiguration[] class allows further configuration by overriding for example the `jsonpMapper()` or `transportOptions()` methods.
|
|
||||||
|
|
||||||
|
|
||||||
The following beans can then be injected in other Spring components:
|
The following beans can then be injected in other Spring components:
|
||||||
@ -135,8 +61,8 @@ JsonpMapper jsonpMapper; <.>
|
|||||||
Basically one should just use the javadoc:org.springframework.data.elasticsearch.core.ElasticsearchOperations[] to interact with the Elasticsearch cluster.
|
Basically one should just use the javadoc:org.springframework.data.elasticsearch.core.ElasticsearchOperations[] to interact with the Elasticsearch cluster.
|
||||||
When using repositories, this instance is used under the hood as well.
|
When using repositories, this instance is used under the hood as well.
|
||||||
|
|
||||||
[[elasticsearch.clients.reactiverest5client]]
|
[[elasticsearch.clients.reactiverestclient]]
|
||||||
== Reactive Rest5Client
|
== Reactive Rest Client
|
||||||
|
|
||||||
When working with the reactive stack, the configuration must be derived from a different class:
|
When working with the reactive stack, the configuration must be derived from a different class:
|
||||||
|
|
||||||
@ -173,65 +99,6 @@ ReactiveElasticsearchOperations operations; <.>
|
|||||||
@Autowired
|
@Autowired
|
||||||
ReactiveElasticsearchClient elasticsearchClient; <.>
|
ReactiveElasticsearchClient elasticsearchClient; <.>
|
||||||
|
|
||||||
@Autowired
|
|
||||||
Rest5Client rest5Client; <.>
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
JsonpMapper jsonpMapper; <.>
|
|
||||||
----
|
|
||||||
|
|
||||||
the following can be injected:
|
|
||||||
|
|
||||||
<.> an implementation of javadoc:org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations[]
|
|
||||||
<.> the `org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchClient` that is used.
|
|
||||||
This is a reactive implementation based on the Elasticsearch client implementation.
|
|
||||||
<.> the low level `RestClient` from the Elasticsearch libraries
|
|
||||||
<.> the `JsonpMapper` user by the Elasticsearch `Transport`
|
|
||||||
====
|
|
||||||
|
|
||||||
Basically one should just use the javadoc:org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations[] to interact with the Elasticsearch cluster.
|
|
||||||
When using repositories, this instance is used under the hood as well.
|
|
||||||
|
|
||||||
[[elasticsearch.clients.reactiverestclient]]
|
|
||||||
== Deprecated Reactive RestClient
|
|
||||||
|
|
||||||
See the section above for the imperative code to use the deprecated RestClient for the necessary dependencies to include.
|
|
||||||
|
|
||||||
When working with the reactive stack, the configuration must be derived from a different class:
|
|
||||||
|
|
||||||
====
|
|
||||||
[source,java]
|
|
||||||
----
|
|
||||||
import org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchLegacyRestClientConfiguration;
|
|
||||||
|
|
||||||
@Configuration
|
|
||||||
public class MyClientConfig extends ReactiveElasticsearchLegacyRestClientConfiguration {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ClientConfiguration clientConfiguration() {
|
|
||||||
return ClientConfiguration.builder() <.>
|
|
||||||
.connectedTo("localhost:9200")
|
|
||||||
.build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
----
|
|
||||||
|
|
||||||
<.> for a detailed description of the builder methods see xref:elasticsearch/clients.adoc#elasticsearch.clients.configuration[Client Configuration]
|
|
||||||
====
|
|
||||||
|
|
||||||
The javadoc:org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchConfiguration[] class allows further configuration by overriding for example the `jsonpMapper()` or `transportOptions()` methods.
|
|
||||||
|
|
||||||
The following beans can then be injected in other Spring components:
|
|
||||||
|
|
||||||
====
|
|
||||||
[source,java]
|
|
||||||
----
|
|
||||||
@Autowired
|
|
||||||
ReactiveElasticsearchOperations operations; <.>
|
|
||||||
|
|
||||||
@Autowired
|
|
||||||
ReactiveElasticsearchClient elasticsearchClient; <.>
|
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
RestClient restClient; <.>
|
RestClient restClient; <.>
|
||||||
|
|
||||||
@ -316,25 +183,8 @@ In the case this is not enough, the user can add callback functions by using the
|
|||||||
|
|
||||||
The following callbacks are provided:
|
The following callbacks are provided:
|
||||||
|
|
||||||
[[elasticsearch.clients.configuration.callbacks.rest5]]
|
|
||||||
==== Configuration of the low level Elasticsearch `Rest5Client`:
|
|
||||||
|
|
||||||
This callback provides a `org.elasticsearch.client.RestClientBuilder` that can be used to configure the Elasticsearch
|
|
||||||
`RestClient`:
|
|
||||||
====
|
|
||||||
[source,java]
|
|
||||||
----
|
|
||||||
ClientConfiguration.builder()
|
|
||||||
.connectedTo("localhost:9200", "localhost:9291")
|
|
||||||
.withClientConfigurer(Rest5Clients.ElasticsearchRest5ClientConfigurationCallback.from(restClientBuilder -> {
|
|
||||||
// configure the Elasticsearch Rest5Client
|
|
||||||
return restClientBuilder;
|
|
||||||
}))
|
|
||||||
.build();
|
|
||||||
----
|
|
||||||
====
|
|
||||||
[[elasticsearch.clients.configuration.callbacks.rest]]
|
[[elasticsearch.clients.configuration.callbacks.rest]]
|
||||||
==== Configuration of the deprecated low level Elasticsearch `RestClient`:
|
==== Configuration of the low level Elasticsearch `RestClient`:
|
||||||
|
|
||||||
This callback provides a `org.elasticsearch.client.RestClientBuilder` that can be used to configure the Elasticsearch
|
This callback provides a `org.elasticsearch.client.RestClientBuilder` that can be used to configure the Elasticsearch
|
||||||
`RestClient`:
|
`RestClient`:
|
||||||
@ -343,7 +193,7 @@ This callback provides a `org.elasticsearch.client.RestClientBuilder` that can b
|
|||||||
----
|
----
|
||||||
ClientConfiguration.builder()
|
ClientConfiguration.builder()
|
||||||
.connectedTo("localhost:9200", "localhost:9291")
|
.connectedTo("localhost:9200", "localhost:9291")
|
||||||
.withClientConfigurer(RestClients.ElasticsearchRestClientConfigurationCallback.from(restClientBuilder -> {
|
.withClientConfigurer(ElasticsearchClients.ElasticsearchRestClientConfigurationCallback.from(restClientBuilder -> {
|
||||||
// configure the Elasticsearch RestClient
|
// configure the Elasticsearch RestClient
|
||||||
return restClientBuilder;
|
return restClientBuilder;
|
||||||
}))
|
}))
|
||||||
@ -351,29 +201,10 @@ ClientConfiguration.builder()
|
|||||||
----
|
----
|
||||||
====
|
====
|
||||||
|
|
||||||
[[elasticsearch.clients.configurationcallbacks.httpasync5]]
|
|
||||||
==== Configuration of the HttpAsyncClient used by the low level Elasticsearch `Rest5Client`:
|
|
||||||
|
|
||||||
This callback provides a `org.apache.hc.client5.http.impl.async.HttpAsyncClientBuilder` to configure the HttpClient that is
|
|
||||||
used by the `Rest5Client`.
|
|
||||||
|
|
||||||
====
|
|
||||||
[source,java]
|
|
||||||
----
|
|
||||||
ClientConfiguration.builder()
|
|
||||||
.connectedTo("localhost:9200", "localhost:9291")
|
|
||||||
.withClientConfigurer(Rest5Clients.ElasticsearchHttpClientConfigurationCallback.from(httpAsyncClientBuilder -> {
|
|
||||||
// configure the HttpAsyncClient
|
|
||||||
return httpAsyncClientBuilder;
|
|
||||||
}))
|
|
||||||
.build();
|
|
||||||
----
|
|
||||||
====
|
|
||||||
|
|
||||||
[[elasticsearch.clients.configurationcallbacks.httpasync]]
|
[[elasticsearch.clients.configurationcallbacks.httpasync]]
|
||||||
==== Configuration of the HttpAsyncClient used by the deprecated low level Elasticsearch `RestClient`:
|
==== Configuration of the HttpAsyncClient used by the low level Elasticsearch `RestClient`:
|
||||||
|
|
||||||
This callback provides a `org.apache.http.impl.nio.client.HttpAsyncClientBuilder` to configure the HttpClient that is
|
This callback provides a `org.apache.http.impl.nio.client.HttpAsyncClientBuilder` to configure the HttpCLient that is
|
||||||
used by the `RestClient`.
|
used by the `RestClient`.
|
||||||
|
|
||||||
====
|
====
|
||||||
@ -381,7 +212,7 @@ used by the `RestClient`.
|
|||||||
----
|
----
|
||||||
ClientConfiguration.builder()
|
ClientConfiguration.builder()
|
||||||
.connectedTo("localhost:9200", "localhost:9291")
|
.connectedTo("localhost:9200", "localhost:9291")
|
||||||
.withClientConfigurer(RestClients.ElasticsearchHttpClientConfigurationCallback.from(httpAsyncClientBuilder -> {
|
.withClientConfigurer(ElasticsearchClients.ElasticsearchHttpClientConfigurationCallback.from(httpAsyncClientBuilder -> {
|
||||||
// configure the HttpAsyncClient
|
// configure the HttpAsyncClient
|
||||||
return httpAsyncClientBuilder;
|
return httpAsyncClientBuilder;
|
||||||
}))
|
}))
|
||||||
|
@ -1,21 +1,11 @@
|
|||||||
[[new-features]]
|
[[new-features]]
|
||||||
= What's new
|
= What's new
|
||||||
|
|
||||||
[[new-features.6-0-0]]
|
|
||||||
== New in Spring Data Elasticsearch 6.0
|
|
||||||
|
|
||||||
* Upgarde to Spring 7
|
|
||||||
* Switch to jspecify nullability annotations
|
|
||||||
* Upgrade to Elasticsearch 9.0.3
|
|
||||||
* Use the new Elasticsearch Rest5Client as default
|
|
||||||
|
|
||||||
|
|
||||||
[[new-features.5-5-0]]
|
[[new-features.5-5-0]]
|
||||||
== New in Spring Data Elasticsearch 5.5
|
== New in Spring Data Elasticsearch 5.5
|
||||||
|
|
||||||
* Upgrade to Elasticsearch 8.18.1.
|
* Upgrade to Elasticsearch 8.17.2.
|
||||||
* Add support for the `@SearchTemplateQuery` annotation on repository methods.
|
* Add support for the `@SearchTemplateQuery` annotation on repository methods.
|
||||||
* Scripted field properties of type collection can be populated from scripts returning arrays.
|
|
||||||
|
|
||||||
[[new-features.5-4-0]]
|
[[new-features.5-4-0]]
|
||||||
== New in Spring Data Elasticsearch 5.4
|
== New in Spring Data Elasticsearch 5.4
|
||||||
|
@ -20,12 +20,12 @@ Whereas the birthdate is fix, the age depends on the time when a query is issued
|
|||||||
====
|
====
|
||||||
[source,java]
|
[source,java]
|
||||||
----
|
----
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.annotation.Id;
|
import org.springframework.data.annotation.Id;
|
||||||
import org.springframework.data.elasticsearch.annotations.DateFormat;
|
import org.springframework.data.elasticsearch.annotations.DateFormat;
|
||||||
import org.springframework.data.elasticsearch.annotations.Document;
|
import org.springframework.data.elasticsearch.annotations.Document;
|
||||||
import org.springframework.data.elasticsearch.annotations.Field;
|
import org.springframework.data.elasticsearch.annotations.Field;
|
||||||
import org.springframework.data.elasticsearch.annotations.ScriptedField;
|
import org.springframework.data.elasticsearch.annotations.ScriptedField;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
import java.time.LocalDate;
|
import java.time.LocalDate;
|
||||||
import java.time.format.DateTimeFormatter;
|
import java.time.format.DateTimeFormatter;
|
||||||
|
@ -6,11 +6,10 @@ The following table shows the Elasticsearch and Spring versions that are used by
|
|||||||
[cols="^,^,^,^",options="header"]
|
[cols="^,^,^,^",options="header"]
|
||||||
|===
|
|===
|
||||||
| Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework
|
| Spring Data Release Train | Spring Data Elasticsearch | Elasticsearch | Spring Framework
|
||||||
| 2025.1 (in development) | 6.0.x | 9.0.3 | 7.0.x
|
| 2025.0 (in development) | 5.5.x | 8.17.2 | 6.2.x
|
||||||
| 2025.0 | 5.5.x | 8.18.1 | 6.2.x
|
|
||||||
| 2024.1 | 5.4.x | 8.15.5 | 6.1.x
|
| 2024.1 | 5.4.x | 8.15.5 | 6.1.x
|
||||||
| 2024.0 | 5.3.xfootnote:oom[Out of maintenance] | 8.13.4 | 6.1.x
|
| 2024.0 | 5.3.x | 8.13.4 | 6.1.x
|
||||||
| 2023.1 (Vaughan) | 5.2.xfootnote:oom[] | 8.11.1 | 6.1.x
|
| 2023.1 (Vaughan) | 5.2.xfootnote:oom[Out of maintenance] | 8.11.1 | 6.1.x
|
||||||
| 2023.0 (Ullmann) | 5.1.xfootnote:oom[] | 8.7.1 | 6.0.x
|
| 2023.0 (Ullmann) | 5.1.xfootnote:oom[] | 8.7.1 | 6.0.x
|
||||||
| 2022.0 (Turing) | 5.0.xfootnote:oom[] | 8.5.3 | 6.0.x
|
| 2022.0 (Turing) | 5.0.xfootnote:oom[] | 8.5.3 | 6.0.x
|
||||||
| 2021.2 (Raj) | 4.4.xfootnote:oom[] | 7.17.3 | 5.3.x
|
| 2021.2 (Raj) | 4.4.xfootnote:oom[] | 7.17.3 | 5.3.x
|
||||||
|
@ -20,11 +20,3 @@ Some classes that probably are not used by a library user have been renamed, the
|
|||||||
|===
|
|===
|
||||||
|
|
||||||
=== Removals
|
=== Removals
|
||||||
|
|
||||||
The following methods that had been deprecated since release 5.3 have been removed:
|
|
||||||
```
|
|
||||||
DocumentOperations.delete(Query, Class<?>)
|
|
||||||
DocumentOperations.delete(Query, Class<?>, IndexCoordinates)
|
|
||||||
ReactiveDocumentOperations.delete(Query, Class<?>)
|
|
||||||
ReactiveDocumentOperations.delete(Query, Class<?>, IndexCoordinates)
|
|
||||||
```
|
|
||||||
|
@ -1,25 +0,0 @@
|
|||||||
[[elasticsearch-migration-guide-5.5-6.0]]
|
|
||||||
= Upgrading from 5.5.x to 6.0.x
|
|
||||||
|
|
||||||
This section describes breaking changes from version 5.5.x to 6.0.x and how removed features can be replaced by new introduced features.
|
|
||||||
|
|
||||||
[[elasticsearch-migration-guide-5.5-6.0.breaking-changes]]
|
|
||||||
== Breaking Changes
|
|
||||||
|
|
||||||
From version 6.0 on, Spring Data Elasticsearch uses the Elasticsearch 9 libraries and as default the new `Rest5Client` provided by these libraries. It is still possible to use the old `RestClient`, check xref:elasticsearch/clients.adoc[Elasticsearch clients] for information. The configuration callbacks for this `RestClient` have been moved from `org.springframework.data.elasticsearch.client.elc.ElasticsearchClients` to the `org.springframework.data.elasticsearch.client.elc.rest_client.RestClients` class.
|
|
||||||
|
|
||||||
[[elasticsearch-migration-guide-5.5-6.0.deprecations]]
|
|
||||||
== Deprecations
|
|
||||||
|
|
||||||
All the code using the old `RestClient` has been moved to the `org.springframework.data.elasticsearch.client.elc.rest_client` package and has been deprecated. Users should switch to the classes from the `org.springframework.data.elasticsearch.client.elc.rest5_client` package.
|
|
||||||
|
|
||||||
|
|
||||||
=== Removals
|
|
||||||
|
|
||||||
The `org.springframework.data.elasticsearch.core.query.ScriptType` enum has been removed. To distinguish between an inline and a stored script set the appropriate values in the `org.springframework.data.elasticsearch.core.query.ScriptData` record.
|
|
||||||
|
|
||||||
These methods have been removed because the Elasticsearch Client 9 does not support them anymore:
|
|
||||||
```
|
|
||||||
org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchIndicesClient.unfreeze(UnfreezeRequest)
|
|
||||||
org.springframework.data.elasticsearch.client.elc.ReactiveElasticsearchIndicesClient.unfreeze(Function<UnfreezeRequest.Builder, ObjectBuilder<UnfreezeRequest>>)
|
|
||||||
```
|
|
@ -15,9 +15,9 @@
|
|||||||
*/
|
*/
|
||||||
package org.springframework.data.elasticsearch;
|
package org.springframework.data.elasticsearch;
|
||||||
|
|
||||||
import java.util.List;
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Object describing an Elasticsearch error
|
* Object describing an Elasticsearch error
|
||||||
@ -26,7 +26,8 @@ import org.jspecify.annotations.Nullable;
|
|||||||
* @since 4.4
|
* @since 4.4
|
||||||
*/
|
*/
|
||||||
public class ElasticsearchErrorCause {
|
public class ElasticsearchErrorCause {
|
||||||
@Nullable private final String type;
|
@Nullable
|
||||||
|
private final String type;
|
||||||
|
|
||||||
private final String reason;
|
private final String reason;
|
||||||
|
|
||||||
|
@ -15,8 +15,8 @@
|
|||||||
*/
|
*/
|
||||||
package org.springframework.data.elasticsearch;
|
package org.springframework.data.elasticsearch;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.dao.UncategorizedDataAccessException;
|
import org.springframework.dao.UncategorizedDataAccessException;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Peter-Josef Meisch
|
* @author Peter-Josef Meisch
|
||||||
|
@ -1,2 +1,3 @@
|
|||||||
@org.jspecify.annotations.NullMarked
|
@org.springframework.lang.NonNullApi
|
||||||
|
@org.springframework.lang.NonNullFields
|
||||||
package org.springframework.data.elasticsearch.annotations;
|
package org.springframework.data.elasticsearch.annotations;
|
||||||
|
@ -19,7 +19,6 @@ import static org.springframework.data.elasticsearch.aot.ElasticsearchAotPredica
|
|||||||
|
|
||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.aot.hint.MemberCategory;
|
import org.springframework.aot.hint.MemberCategory;
|
||||||
import org.springframework.aot.hint.RuntimeHints;
|
import org.springframework.aot.hint.RuntimeHints;
|
||||||
import org.springframework.aot.hint.RuntimeHintsRegistrar;
|
import org.springframework.aot.hint.RuntimeHintsRegistrar;
|
||||||
@ -33,6 +32,7 @@ import org.springframework.data.elasticsearch.core.event.ReactiveAfterConvertCal
|
|||||||
import org.springframework.data.elasticsearch.core.event.ReactiveAfterLoadCallback;
|
import org.springframework.data.elasticsearch.core.event.ReactiveAfterLoadCallback;
|
||||||
import org.springframework.data.elasticsearch.core.event.ReactiveAfterSaveCallback;
|
import org.springframework.data.elasticsearch.core.event.ReactiveAfterSaveCallback;
|
||||||
import org.springframework.data.elasticsearch.core.event.ReactiveBeforeConvertCallback;
|
import org.springframework.data.elasticsearch.core.event.ReactiveBeforeConvertCallback;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Peter-Josef Meisch
|
* @author Peter-Josef Meisch
|
||||||
|
@ -1,2 +1,3 @@
|
|||||||
@org.jspecify.annotations.NullMarked
|
@org.springframework.lang.NonNullApi
|
||||||
|
@org.springframework.lang.NonNullFields
|
||||||
package org.springframework.data.elasticsearch.aot;
|
package org.springframework.data.elasticsearch.aot;
|
||||||
|
@ -25,8 +25,8 @@ import java.util.function.Supplier;
|
|||||||
import javax.net.ssl.HostnameVerifier;
|
import javax.net.ssl.HostnameVerifier;
|
||||||
import javax.net.ssl.SSLContext;
|
import javax.net.ssl.SSLContext;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.support.HttpHeaders;
|
import org.springframework.data.elasticsearch.support.HttpHeaders;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Configuration interface exposing common client configuration properties for Elasticsearch clients.
|
* Configuration interface exposing common client configuration properties for Elasticsearch clients.
|
||||||
@ -127,16 +127,10 @@ public interface ClientConfiguration {
|
|||||||
Optional<String> getCaFingerprint();
|
Optional<String> getCaFingerprint();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns the {@link HostnameVerifier} to use. Must be {@link Optional#empty()} if not configured.
|
* Returns the {@link HostnameVerifier} to use. Can be {@link Optional#empty()} if not configured.
|
||||||
* Cannot be used with the Rest5Client used from Elasticsearch 9 on as the underlying Apache http components 5 does not offer a way
|
|
||||||
* to set this. Users that need a hostname verifier must integrate this in a SSLContext.
|
|
||||||
* Returning a value here is ignored in this case
|
|
||||||
*
|
*
|
||||||
* @return the {@link HostnameVerifier} to use. Can be {@link Optional#empty()} if not configured.
|
* @return the {@link HostnameVerifier} to use. Can be {@link Optional#empty()} if not configured.
|
||||||
* @deprecated since 6.0
|
|
||||||
*/
|
*/
|
||||||
// todo #3117 document this
|
|
||||||
@Deprecated(since = "6.0", forRemoval=true)
|
|
||||||
Optional<HostnameVerifier> getHostNameVerifier();
|
Optional<HostnameVerifier> getHostNameVerifier();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -25,11 +25,11 @@ import java.util.function.Supplier;
|
|||||||
import javax.net.ssl.HostnameVerifier;
|
import javax.net.ssl.HostnameVerifier;
|
||||||
import javax.net.ssl.SSLContext;
|
import javax.net.ssl.SSLContext;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationBuilderWithRequiredEndpoint;
|
import org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationBuilderWithRequiredEndpoint;
|
||||||
import org.springframework.data.elasticsearch.client.ClientConfiguration.MaybeSecureClientConfigurationBuilder;
|
import org.springframework.data.elasticsearch.client.ClientConfiguration.MaybeSecureClientConfigurationBuilder;
|
||||||
import org.springframework.data.elasticsearch.client.ClientConfiguration.TerminalClientConfigurationBuilder;
|
import org.springframework.data.elasticsearch.client.ClientConfiguration.TerminalClientConfigurationBuilder;
|
||||||
import org.springframework.data.elasticsearch.support.HttpHeaders;
|
import org.springframework.data.elasticsearch.support.HttpHeaders;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -24,8 +24,9 @@ import java.util.function.Supplier;
|
|||||||
import javax.net.ssl.HostnameVerifier;
|
import javax.net.ssl.HostnameVerifier;
|
||||||
import javax.net.ssl.SSLContext;
|
import javax.net.ssl.SSLContext;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
import org.elasticsearch.client.RestClientBuilder.HttpClientConfigCallback;
|
||||||
import org.springframework.data.elasticsearch.support.HttpHeaders;
|
import org.springframework.data.elasticsearch.support.HttpHeaders;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default {@link ClientConfiguration} implementation.
|
* Default {@link ClientConfiguration} implementation.
|
||||||
|
@ -17,10 +17,10 @@ package org.springframework.data.elasticsearch.client.elc;
|
|||||||
|
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
|
import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
|
||||||
import org.springframework.data.elasticsearch.core.query.Query;
|
import org.springframework.data.elasticsearch.core.query.Query;
|
||||||
import org.springframework.data.elasticsearch.core.query.StringQuery;
|
import org.springframework.data.elasticsearch.core.query.StringQuery;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An abstract class that serves as a base for query processors. It provides a common interface and basic functionality
|
* An abstract class that serves as a base for query processors. It provides a common interface and basic functionality
|
||||||
@ -38,8 +38,8 @@ public abstract class AbstractQueryProcessor {
|
|||||||
* @param queryConverter correct mapped field names and the values to the converted values.
|
* @param queryConverter correct mapped field names and the values to the converted values.
|
||||||
* @return an Elasticsearch {@literal query}.
|
* @return an Elasticsearch {@literal query}.
|
||||||
*/
|
*/
|
||||||
|
@Nullable
|
||||||
static co.elastic.clients.elasticsearch._types.query_dsl.@Nullable Query getEsQuery(@Nullable Query query,
|
static co.elastic.clients.elasticsearch._types.query_dsl.Query getEsQuery(@Nullable Query query,
|
||||||
@Nullable Consumer<Query> queryConverter) {
|
@Nullable Consumer<Query> queryConverter) {
|
||||||
if (query == null) {
|
if (query == null) {
|
||||||
return null;
|
return null;
|
||||||
|
@ -31,13 +31,13 @@ import java.util.Iterator;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.annotations.FieldType;
|
import org.springframework.data.elasticsearch.annotations.FieldType;
|
||||||
import org.springframework.data.elasticsearch.core.query.Criteria;
|
import org.springframework.data.elasticsearch.core.query.Criteria;
|
||||||
import org.springframework.data.elasticsearch.core.query.Field;
|
import org.springframework.data.elasticsearch.core.query.Field;
|
||||||
import org.springframework.data.elasticsearch.core.query.HasChildQuery;
|
import org.springframework.data.elasticsearch.core.query.HasChildQuery;
|
||||||
import org.springframework.data.elasticsearch.core.query.HasParentQuery;
|
import org.springframework.data.elasticsearch.core.query.HasParentQuery;
|
||||||
import org.springframework.data.elasticsearch.core.query.InnerHitsQuery;
|
import org.springframework.data.elasticsearch.core.query.InnerHitsQuery;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -24,17 +24,6 @@ import co.elastic.clients.elasticsearch.core.search.Hit;
|
|||||||
import co.elastic.clients.elasticsearch.core.search.NestedIdentity;
|
import co.elastic.clients.elasticsearch.core.search.NestedIdentity;
|
||||||
import co.elastic.clients.json.JsonData;
|
import co.elastic.clients.json.JsonData;
|
||||||
import co.elastic.clients.json.JsonpMapper;
|
import co.elastic.clients.json.JsonpMapper;
|
||||||
import org.apache.commons.logging.Log;
|
|
||||||
import org.apache.commons.logging.LogFactory;
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.MultiGetItem;
|
|
||||||
import org.springframework.data.elasticsearch.core.document.Document;
|
|
||||||
import org.springframework.data.elasticsearch.core.document.Explanation;
|
|
||||||
import org.springframework.data.elasticsearch.core.document.NestedMetaData;
|
|
||||||
import org.springframework.data.elasticsearch.core.document.SearchDocument;
|
|
||||||
import org.springframework.data.elasticsearch.core.document.SearchDocumentAdapter;
|
|
||||||
import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
|
|
||||||
import org.springframework.util.Assert;
|
|
||||||
|
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
@ -43,6 +32,18 @@ import java.util.Map;
|
|||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import org.apache.commons.logging.Log;
|
||||||
|
import org.apache.commons.logging.LogFactory;
|
||||||
|
import org.springframework.data.elasticsearch.core.MultiGetItem;
|
||||||
|
import org.springframework.data.elasticsearch.core.document.Document;
|
||||||
|
import org.springframework.data.elasticsearch.core.document.Explanation;
|
||||||
|
import org.springframework.data.elasticsearch.core.document.NestedMetaData;
|
||||||
|
import org.springframework.data.elasticsearch.core.document.SearchDocument;
|
||||||
|
import org.springframework.data.elasticsearch.core.document.SearchDocumentAdapter;
|
||||||
|
import org.springframework.data.elasticsearch.core.document.SearchDocumentResponse;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Utility class to adapt different Elasticsearch responses to a
|
* Utility class to adapt different Elasticsearch responses to a
|
||||||
* {@link org.springframework.data.elasticsearch.core.document.Document}
|
* {@link org.springframework.data.elasticsearch.core.document.Document}
|
||||||
@ -56,8 +57,7 @@ final class DocumentAdapters {
|
|||||||
|
|
||||||
private static final Log LOGGER = LogFactory.getLog(DocumentAdapters.class);
|
private static final Log LOGGER = LogFactory.getLog(DocumentAdapters.class);
|
||||||
|
|
||||||
private DocumentAdapters() {
|
private DocumentAdapters() {}
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a {@link SearchDocument} from a {@link Hit} returned by the Elasticsearch client.
|
* Creates a {@link SearchDocument} from a {@link Hit} returned by the Elasticsearch client.
|
||||||
@ -83,7 +83,7 @@ final class DocumentAdapters {
|
|||||||
|
|
||||||
Explanation explanation = from(hit.explanation());
|
Explanation explanation = from(hit.explanation());
|
||||||
|
|
||||||
Map<String, Double> matchedQueries = hit.matchedQueries();
|
List<String> matchedQueries = hit.matchedQueries();
|
||||||
|
|
||||||
Function<Map<String, JsonData>, EntityAsMap> fromFields = fields -> {
|
Function<Map<String, JsonData>, EntityAsMap> fromFields = fields -> {
|
||||||
StringBuilder sb = new StringBuilder("{");
|
StringBuilder sb = new StringBuilder("{");
|
||||||
@ -160,7 +160,7 @@ final class DocumentAdapters {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
private static Explanation from(co.elastic.clients.elasticsearch.core.explain.@Nullable Explanation explanation) {
|
private static Explanation from(@Nullable co.elastic.clients.elasticsearch.core.explain.Explanation explanation) {
|
||||||
|
|
||||||
if (explanation == null) {
|
if (explanation == null) {
|
||||||
return null;
|
return null;
|
||||||
|
@ -22,8 +22,8 @@ import java.util.HashMap;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.AggregationsContainer;
|
import org.springframework.data.elasticsearch.core.AggregationsContainer;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -19,12 +19,12 @@ import co.elastic.clients.elasticsearch.ElasticsearchClient;
|
|||||||
|
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.beans.factory.DisposableBean;
|
import org.springframework.beans.factory.DisposableBean;
|
||||||
import org.springframework.beans.factory.FactoryBean;
|
import org.springframework.beans.factory.FactoryBean;
|
||||||
import org.springframework.beans.factory.FactoryBeanNotInitializedException;
|
import org.springframework.beans.factory.FactoryBeanNotInitializedException;
|
||||||
import org.springframework.beans.factory.InitializingBean;
|
import org.springframework.beans.factory.InitializingBean;
|
||||||
import org.springframework.data.elasticsearch.client.ClientConfiguration;
|
import org.springframework.data.elasticsearch.client.ClientConfiguration;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -15,38 +15,44 @@
|
|||||||
*/
|
*/
|
||||||
package org.springframework.data.elasticsearch.client.elc;
|
package org.springframework.data.elasticsearch.client.elc;
|
||||||
|
|
||||||
import static org.springframework.data.elasticsearch.client.elc.rest5_client.Rest5Clients.*;
|
|
||||||
import static org.springframework.data.elasticsearch.client.elc.rest_client.RestClients.*;
|
|
||||||
|
|
||||||
import co.elastic.clients.elasticsearch.ElasticsearchClient;
|
import co.elastic.clients.elasticsearch.ElasticsearchClient;
|
||||||
import co.elastic.clients.json.JsonpMapper;
|
import co.elastic.clients.json.JsonpMapper;
|
||||||
import co.elastic.clients.json.jackson.JacksonJsonpMapper;
|
import co.elastic.clients.json.jackson.JacksonJsonpMapper;
|
||||||
import co.elastic.clients.transport.ElasticsearchTransport;
|
import co.elastic.clients.transport.ElasticsearchTransport;
|
||||||
import co.elastic.clients.transport.TransportOptions;
|
import co.elastic.clients.transport.TransportOptions;
|
||||||
|
import co.elastic.clients.transport.TransportUtils;
|
||||||
import co.elastic.clients.transport.Version;
|
import co.elastic.clients.transport.Version;
|
||||||
import co.elastic.clients.transport.rest5_client.Rest5ClientOptions;
|
|
||||||
import co.elastic.clients.transport.rest5_client.Rest5ClientTransport;
|
|
||||||
import co.elastic.clients.transport.rest5_client.low_level.RequestOptions;
|
|
||||||
import co.elastic.clients.transport.rest5_client.low_level.Rest5Client;
|
|
||||||
import co.elastic.clients.transport.rest_client.RestClientOptions;
|
import co.elastic.clients.transport.rest_client.RestClientOptions;
|
||||||
import co.elastic.clients.transport.rest_client.RestClientTransport;
|
import co.elastic.clients.transport.rest_client.RestClientTransport;
|
||||||
|
|
||||||
|
import java.net.InetSocketAddress;
|
||||||
|
import java.time.Duration;
|
||||||
|
import java.util.Arrays;
|
||||||
|
import java.util.List;
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
import java.util.function.Supplier;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import org.apache.http.HttpHost;
|
||||||
|
import org.apache.http.HttpRequest;
|
||||||
|
import org.apache.http.HttpRequestInterceptor;
|
||||||
|
import org.apache.http.client.config.RequestConfig;
|
||||||
import org.apache.http.entity.ContentType;
|
import org.apache.http.entity.ContentType;
|
||||||
import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
|
import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
|
||||||
|
import org.apache.http.message.BasicHeader;
|
||||||
import org.apache.http.message.BasicNameValuePair;
|
import org.apache.http.message.BasicNameValuePair;
|
||||||
|
import org.apache.http.protocol.HttpContext;
|
||||||
|
import org.elasticsearch.client.RequestOptions;
|
||||||
import org.elasticsearch.client.RestClient;
|
import org.elasticsearch.client.RestClient;
|
||||||
import org.jspecify.annotations.Nullable;
|
import org.elasticsearch.client.RestClientBuilder;
|
||||||
import org.springframework.data.elasticsearch.client.ClientConfiguration;
|
import org.springframework.data.elasticsearch.client.ClientConfiguration;
|
||||||
import org.springframework.data.elasticsearch.support.VersionInfo;
|
import org.springframework.data.elasticsearch.support.HttpHeaders;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Utility class to create the different Elasticsearch clients. The RestClient class is the one used in Elasticsearch
|
* Utility class to create the different Elasticsearch clients
|
||||||
* until version 9, it is still available, but it's use is deprecated. The Rest5Client class is the one that should be
|
|
||||||
* used from Elasticsearch 9 on.
|
|
||||||
*
|
*
|
||||||
* @author Peter-Josef Meisch
|
* @author Peter-Josef Meisch
|
||||||
* @since 4.4
|
* @since 4.4
|
||||||
@ -113,32 +119,18 @@ public final class ElasticsearchClients {
|
|||||||
*
|
*
|
||||||
* @param restClient the underlying {@link RestClient}
|
* @param restClient the underlying {@link RestClient}
|
||||||
* @return the {@link ReactiveElasticsearchClient}
|
* @return the {@link ReactiveElasticsearchClient}
|
||||||
* @deprecated since 6.0, use the version with a Rest5Client.
|
|
||||||
*/
|
*/
|
||||||
@Deprecated(since = "6.0", forRemoval = true)
|
|
||||||
public static ReactiveElasticsearchClient createReactive(RestClient restClient) {
|
public static ReactiveElasticsearchClient createReactive(RestClient restClient) {
|
||||||
return createReactive(restClient, null, DEFAULT_JSONP_MAPPER);
|
return createReactive(restClient, null, DEFAULT_JSONP_MAPPER);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new {@link ReactiveElasticsearchClient}.
|
|
||||||
*
|
|
||||||
* @param rest5Client the underlying {@link RestClient}
|
|
||||||
* @return the {@link ReactiveElasticsearchClient}
|
|
||||||
*/
|
|
||||||
public static ReactiveElasticsearchClient createReactive(Rest5Client rest5Client) {
|
|
||||||
return createReactive(rest5Client, null, DEFAULT_JSONP_MAPPER);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new {@link ReactiveElasticsearchClient}.
|
* Creates a new {@link ReactiveElasticsearchClient}.
|
||||||
*
|
*
|
||||||
* @param restClient the underlying {@link RestClient}
|
* @param restClient the underlying {@link RestClient}
|
||||||
* @param transportOptions options to be added to each request.
|
* @param transportOptions options to be added to each request.
|
||||||
* @return the {@link ReactiveElasticsearchClient}
|
* @return the {@link ReactiveElasticsearchClient}
|
||||||
* @deprecated since 6.0, use the version with a Rest5Client.
|
|
||||||
*/
|
*/
|
||||||
@Deprecated(since = "6.0", forRemoval = true)
|
|
||||||
public static ReactiveElasticsearchClient createReactive(RestClient restClient,
|
public static ReactiveElasticsearchClient createReactive(RestClient restClient,
|
||||||
@Nullable TransportOptions transportOptions, JsonpMapper jsonpMapper) {
|
@Nullable TransportOptions transportOptions, JsonpMapper jsonpMapper) {
|
||||||
|
|
||||||
@ -147,21 +139,6 @@ public final class ElasticsearchClients {
|
|||||||
var transport = getElasticsearchTransport(restClient, REACTIVE_CLIENT, transportOptions, jsonpMapper);
|
var transport = getElasticsearchTransport(restClient, REACTIVE_CLIENT, transportOptions, jsonpMapper);
|
||||||
return createReactive(transport);
|
return createReactive(transport);
|
||||||
}
|
}
|
||||||
/**
|
|
||||||
* Creates a new {@link ReactiveElasticsearchClient}.
|
|
||||||
*
|
|
||||||
* @param rest5Client the underlying {@link RestClient}
|
|
||||||
* @param transportOptions options to be added to each request.
|
|
||||||
* @return the {@link ReactiveElasticsearchClient}
|
|
||||||
*/
|
|
||||||
public static ReactiveElasticsearchClient createReactive(Rest5Client rest5Client,
|
|
||||||
@Nullable TransportOptions transportOptions, JsonpMapper jsonpMapper) {
|
|
||||||
|
|
||||||
Assert.notNull(rest5Client, "restClient must not be null");
|
|
||||||
|
|
||||||
var transport = getElasticsearchTransport(rest5Client, REACTIVE_CLIENT, transportOptions, jsonpMapper);
|
|
||||||
return createReactive(transport);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new {@link ReactiveElasticsearchClient} that uses the given {@link ElasticsearchTransport}.
|
* Creates a new {@link ReactiveElasticsearchClient} that uses the given {@link ElasticsearchTransport}.
|
||||||
@ -179,21 +156,17 @@ public final class ElasticsearchClients {
|
|||||||
|
|
||||||
// region imperative client
|
// region imperative client
|
||||||
/**
|
/**
|
||||||
* Creates a new imperative {@link ElasticsearchClient}. This uses a RestClient, if the old RestClient is needed, this
|
* Creates a new imperative {@link ElasticsearchClient}
|
||||||
* must be created with the {@link org.springframework.data.elasticsearch.client.elc.rest_client.RestClients} class
|
|
||||||
* and passed in as parameter.
|
|
||||||
*
|
*
|
||||||
* @param clientConfiguration configuration options, must not be {@literal null}.
|
* @param clientConfiguration configuration options, must not be {@literal null}.
|
||||||
* @return the {@link ElasticsearchClient}
|
* @return the {@link ElasticsearchClient}
|
||||||
*/
|
*/
|
||||||
public static ElasticsearchClient createImperative(ClientConfiguration clientConfiguration) {
|
public static ElasticsearchClient createImperative(ClientConfiguration clientConfiguration) {
|
||||||
return createImperative(getRest5Client(clientConfiguration), null, DEFAULT_JSONP_MAPPER);
|
return createImperative(getRestClient(clientConfiguration), null, DEFAULT_JSONP_MAPPER);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new imperative {@link ElasticsearchClient}. This uses a RestClient, if the old RestClient is needed, this
|
* Creates a new imperative {@link ElasticsearchClient}
|
||||||
* must be created with the {@link org.springframework.data.elasticsearch.client.elc.rest_client.RestClients} class
|
|
||||||
* and passed in as parameter.
|
|
||||||
*
|
*
|
||||||
* @param clientConfiguration configuration options, must not be {@literal null}.
|
* @param clientConfiguration configuration options, must not be {@literal null}.
|
||||||
* @param transportOptions options to be added to each request.
|
* @param transportOptions options to be added to each request.
|
||||||
@ -201,7 +174,7 @@ public final class ElasticsearchClients {
|
|||||||
*/
|
*/
|
||||||
public static ElasticsearchClient createImperative(ClientConfiguration clientConfiguration,
|
public static ElasticsearchClient createImperative(ClientConfiguration clientConfiguration,
|
||||||
TransportOptions transportOptions) {
|
TransportOptions transportOptions) {
|
||||||
return createImperative(getRest5Client(clientConfiguration), transportOptions, DEFAULT_JSONP_MAPPER);
|
return createImperative(getRestClient(clientConfiguration), transportOptions, DEFAULT_JSONP_MAPPER);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -209,23 +182,11 @@ public final class ElasticsearchClients {
|
|||||||
*
|
*
|
||||||
* @param restClient the RestClient to use
|
* @param restClient the RestClient to use
|
||||||
* @return the {@link ElasticsearchClient}
|
* @return the {@link ElasticsearchClient}
|
||||||
* @deprecated since 6.0, use the version with a Rest5Client.
|
|
||||||
*/
|
*/
|
||||||
@Deprecated(since = "6.0", forRemoval = true)
|
|
||||||
public static ElasticsearchClient createImperative(RestClient restClient) {
|
public static ElasticsearchClient createImperative(RestClient restClient) {
|
||||||
return createImperative(restClient, null, DEFAULT_JSONP_MAPPER);
|
return createImperative(restClient, null, DEFAULT_JSONP_MAPPER);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new imperative {@link ElasticsearchClient}
|
|
||||||
*
|
|
||||||
* @param rest5Client the Rest5Client to use
|
|
||||||
* @return the {@link ElasticsearchClient}
|
|
||||||
*/
|
|
||||||
public static ElasticsearchClient createImperative(Rest5Client rest5Client) {
|
|
||||||
return createImperative(rest5Client, null, DEFAULT_JSONP_MAPPER);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new imperative {@link ElasticsearchClient}
|
* Creates a new imperative {@link ElasticsearchClient}
|
||||||
*
|
*
|
||||||
@ -233,9 +194,7 @@ public final class ElasticsearchClients {
|
|||||||
* @param transportOptions options to be added to each request.
|
* @param transportOptions options to be added to each request.
|
||||||
* @param jsonpMapper the mapper for the transport to use
|
* @param jsonpMapper the mapper for the transport to use
|
||||||
* @return the {@link ElasticsearchClient}
|
* @return the {@link ElasticsearchClient}
|
||||||
* @deprecated since 6.0, use the version with a Rest5Client.
|
|
||||||
*/
|
*/
|
||||||
@Deprecated(since = "6.0", forRemoval = true)
|
|
||||||
public static ElasticsearchClient createImperative(RestClient restClient, @Nullable TransportOptions transportOptions,
|
public static ElasticsearchClient createImperative(RestClient restClient, @Nullable TransportOptions transportOptions,
|
||||||
JsonpMapper jsonpMapper) {
|
JsonpMapper jsonpMapper) {
|
||||||
|
|
||||||
@ -247,27 +206,6 @@ public final class ElasticsearchClients {
|
|||||||
return createImperative(transport);
|
return createImperative(transport);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a new imperative {@link ElasticsearchClient}
|
|
||||||
*
|
|
||||||
* @param rest5Client the Rest5Client to use
|
|
||||||
* @param transportOptions options to be added to each request.
|
|
||||||
* @param jsonpMapper the mapper for the transport to use
|
|
||||||
* @return the {@link ElasticsearchClient}
|
|
||||||
* @since 6.0
|
|
||||||
*/
|
|
||||||
public static ElasticsearchClient createImperative(Rest5Client rest5Client,
|
|
||||||
@Nullable TransportOptions transportOptions,
|
|
||||||
JsonpMapper jsonpMapper) {
|
|
||||||
|
|
||||||
Assert.notNull(rest5Client, "restClient must not be null");
|
|
||||||
|
|
||||||
ElasticsearchTransport transport = getElasticsearchTransport(rest5Client, IMPERATIVE_CLIENT, transportOptions,
|
|
||||||
jsonpMapper);
|
|
||||||
|
|
||||||
return createImperative(transport);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a new {@link ElasticsearchClient} that uses the given {@link ElasticsearchTransport}.
|
* Creates a new {@link ElasticsearchClient} that uses the given {@link ElasticsearchTransport}.
|
||||||
*
|
*
|
||||||
@ -282,6 +220,96 @@ public final class ElasticsearchClients {
|
|||||||
}
|
}
|
||||||
// endregion
|
// endregion
|
||||||
|
|
||||||
|
// region low level RestClient
|
||||||
|
private static RestClientOptions.Builder getRestClientOptionsBuilder(@Nullable TransportOptions transportOptions) {
|
||||||
|
|
||||||
|
if (transportOptions instanceof RestClientOptions restClientOptions) {
|
||||||
|
return restClientOptions.toBuilder();
|
||||||
|
}
|
||||||
|
|
||||||
|
var builder = new RestClientOptions.Builder(RequestOptions.DEFAULT.toBuilder());
|
||||||
|
|
||||||
|
if (transportOptions != null) {
|
||||||
|
transportOptions.headers().forEach(header -> builder.addHeader(header.getKey(), header.getValue()));
|
||||||
|
transportOptions.queryParameters().forEach(builder::setParameter);
|
||||||
|
builder.onWarnings(transportOptions.onWarnings());
|
||||||
|
}
|
||||||
|
|
||||||
|
return builder;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates a low level {@link RestClient} for the given configuration.
|
||||||
|
*
|
||||||
|
* @param clientConfiguration must not be {@literal null}
|
||||||
|
* @return the {@link RestClient}
|
||||||
|
*/
|
||||||
|
public static RestClient getRestClient(ClientConfiguration clientConfiguration) {
|
||||||
|
return getRestClientBuilder(clientConfiguration).build();
|
||||||
|
}
|
||||||
|
|
||||||
|
private static RestClientBuilder getRestClientBuilder(ClientConfiguration clientConfiguration) {
|
||||||
|
HttpHost[] httpHosts = formattedHosts(clientConfiguration.getEndpoints(), clientConfiguration.useSsl()).stream()
|
||||||
|
.map(HttpHost::create).toArray(HttpHost[]::new);
|
||||||
|
RestClientBuilder builder = RestClient.builder(httpHosts);
|
||||||
|
|
||||||
|
if (clientConfiguration.getPathPrefix() != null) {
|
||||||
|
builder.setPathPrefix(clientConfiguration.getPathPrefix());
|
||||||
|
}
|
||||||
|
|
||||||
|
HttpHeaders headers = clientConfiguration.getDefaultHeaders();
|
||||||
|
|
||||||
|
if (!headers.isEmpty()) {
|
||||||
|
builder.setDefaultHeaders(toHeaderArray(headers));
|
||||||
|
}
|
||||||
|
|
||||||
|
builder.setHttpClientConfigCallback(clientBuilder -> {
|
||||||
|
if (clientConfiguration.getCaFingerprint().isPresent()) {
|
||||||
|
clientBuilder
|
||||||
|
.setSSLContext(TransportUtils.sslContextFromCaFingerprint(clientConfiguration.getCaFingerprint().get()));
|
||||||
|
}
|
||||||
|
clientConfiguration.getSslContext().ifPresent(clientBuilder::setSSLContext);
|
||||||
|
clientConfiguration.getHostNameVerifier().ifPresent(clientBuilder::setSSLHostnameVerifier);
|
||||||
|
clientBuilder.addInterceptorLast(new CustomHeaderInjector(clientConfiguration.getHeadersSupplier()));
|
||||||
|
|
||||||
|
RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
|
||||||
|
Duration connectTimeout = clientConfiguration.getConnectTimeout();
|
||||||
|
|
||||||
|
if (!connectTimeout.isNegative()) {
|
||||||
|
requestConfigBuilder.setConnectTimeout(Math.toIntExact(connectTimeout.toMillis()));
|
||||||
|
}
|
||||||
|
|
||||||
|
Duration socketTimeout = clientConfiguration.getSocketTimeout();
|
||||||
|
|
||||||
|
if (!socketTimeout.isNegative()) {
|
||||||
|
requestConfigBuilder.setSocketTimeout(Math.toIntExact(socketTimeout.toMillis()));
|
||||||
|
requestConfigBuilder.setConnectionRequestTimeout(Math.toIntExact(socketTimeout.toMillis()));
|
||||||
|
}
|
||||||
|
|
||||||
|
clientBuilder.setDefaultRequestConfig(requestConfigBuilder.build());
|
||||||
|
|
||||||
|
clientConfiguration.getProxy().map(HttpHost::create).ifPresent(clientBuilder::setProxy);
|
||||||
|
|
||||||
|
for (ClientConfiguration.ClientConfigurationCallback<?> clientConfigurer : clientConfiguration
|
||||||
|
.getClientConfigurers()) {
|
||||||
|
if (clientConfigurer instanceof ElasticsearchHttpClientConfigurationCallback restClientConfigurationCallback) {
|
||||||
|
clientBuilder = restClientConfigurationCallback.configure(clientBuilder);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return clientBuilder;
|
||||||
|
});
|
||||||
|
|
||||||
|
for (ClientConfiguration.ClientConfigurationCallback<?> clientConfigurationCallback : clientConfiguration
|
||||||
|
.getClientConfigurers()) {
|
||||||
|
if (clientConfigurationCallback instanceof ElasticsearchRestClientConfigurationCallback configurationCallback) {
|
||||||
|
builder = configurationCallback.configure(builder);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return builder;
|
||||||
|
}
|
||||||
|
// endregion
|
||||||
|
|
||||||
// region Elasticsearch transport
|
// region Elasticsearch transport
|
||||||
/**
|
/**
|
||||||
* Creates an {@link ElasticsearchTransport} that will use the given client that additionally is customized with a
|
* Creates an {@link ElasticsearchTransport} that will use the given client that additionally is customized with a
|
||||||
@ -292,9 +320,7 @@ public final class ElasticsearchClients {
|
|||||||
* @param transportOptions options for the transport
|
* @param transportOptions options for the transport
|
||||||
* @param jsonpMapper mapper for the transport
|
* @param jsonpMapper mapper for the transport
|
||||||
* @return ElasticsearchTransport
|
* @return ElasticsearchTransport
|
||||||
* @deprecated since 6.0, use the version taking a Rest5Client
|
|
||||||
*/
|
*/
|
||||||
@Deprecated(since = "6.0", forRemoval = true)
|
|
||||||
public static ElasticsearchTransport getElasticsearchTransport(RestClient restClient, String clientType,
|
public static ElasticsearchTransport getElasticsearchTransport(RestClient restClient, String clientType,
|
||||||
@Nullable TransportOptions transportOptions, JsonpMapper jsonpMapper) {
|
@Nullable TransportOptions transportOptions, JsonpMapper jsonpMapper) {
|
||||||
|
|
||||||
@ -303,7 +329,7 @@ public final class ElasticsearchClients {
|
|||||||
Assert.notNull(jsonpMapper, "jsonpMapper must not be null");
|
Assert.notNull(jsonpMapper, "jsonpMapper must not be null");
|
||||||
|
|
||||||
TransportOptions.Builder transportOptionsBuilder = transportOptions != null ? transportOptions.toBuilder()
|
TransportOptions.Builder transportOptionsBuilder = transportOptions != null ? transportOptions.toBuilder()
|
||||||
: new RestClientOptions(org.elasticsearch.client.RequestOptions.DEFAULT, false).toBuilder();
|
: new RestClientOptions(RequestOptions.DEFAULT, false).toBuilder();
|
||||||
|
|
||||||
RestClientOptions.Builder restClientOptionsBuilder = getRestClientOptionsBuilder(transportOptions);
|
RestClientOptions.Builder restClientOptionsBuilder = getRestClientOptionsBuilder(transportOptions);
|
||||||
|
|
||||||
@ -327,35 +353,70 @@ public final class ElasticsearchClients {
|
|||||||
|
|
||||||
return new RestClientTransport(restClient, jsonpMapper, restClientOptionsBuilder.build());
|
return new RestClientTransport(restClient, jsonpMapper, restClientOptionsBuilder.build());
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates an {@link ElasticsearchTransport} that will use the given client that additionally is customized with a
|
|
||||||
* header to contain the clientType
|
|
||||||
*
|
|
||||||
* @param rest5Client the client to use
|
|
||||||
* @param clientType the client type to pass in each request as header
|
|
||||||
* @param transportOptions options for the transport
|
|
||||||
* @param jsonpMapper mapper for the transport
|
|
||||||
* @return ElasticsearchTransport
|
|
||||||
*/
|
|
||||||
public static ElasticsearchTransport getElasticsearchTransport(Rest5Client rest5Client, String clientType,
|
|
||||||
@Nullable TransportOptions transportOptions, JsonpMapper jsonpMapper) {
|
|
||||||
|
|
||||||
Assert.notNull(rest5Client, "restClient must not be null");
|
|
||||||
Assert.notNull(clientType, "clientType must not be null");
|
|
||||||
Assert.notNull(jsonpMapper, "jsonpMapper must not be null");
|
|
||||||
|
|
||||||
TransportOptions.Builder transportOptionsBuilder = transportOptions != null ? transportOptions.toBuilder()
|
|
||||||
: new Rest5ClientOptions(RequestOptions.DEFAULT, false).toBuilder();
|
|
||||||
|
|
||||||
Rest5ClientOptions.Builder rest5ClientOptionsBuilder = getRest5ClientOptionsBuilder(transportOptions);
|
|
||||||
|
|
||||||
rest5ClientOptionsBuilder.addHeader(X_SPRING_DATA_ELASTICSEARCH_CLIENT,
|
|
||||||
VersionInfo.clientVersions() + " / " + clientType);
|
|
||||||
|
|
||||||
return new Rest5ClientTransport(rest5Client, jsonpMapper, rest5ClientOptionsBuilder.build());
|
|
||||||
}
|
|
||||||
// endregion
|
// endregion
|
||||||
|
|
||||||
// todo #3117 remove and document that ElasticsearchHttpClientConfigurationCallback has been move to RestClients.
|
private static List<String> formattedHosts(List<InetSocketAddress> hosts, boolean useSsl) {
|
||||||
|
return hosts.stream().map(it -> (useSsl ? "https" : "http") + "://" + it.getHostString() + ':' + it.getPort())
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
|
||||||
|
private static org.apache.http.Header[] toHeaderArray(HttpHeaders headers) {
|
||||||
|
return headers.entrySet().stream() //
|
||||||
|
.flatMap(entry -> entry.getValue().stream() //
|
||||||
|
.map(value -> new BasicHeader(entry.getKey(), value))) //
|
||||||
|
.toArray(org.apache.http.Header[]::new);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Interceptor to inject custom supplied headers.
|
||||||
|
*
|
||||||
|
* @since 4.4
|
||||||
|
*/
|
||||||
|
private record CustomHeaderInjector(Supplier<HttpHeaders> headersSupplier) implements HttpRequestInterceptor {
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void process(HttpRequest request, HttpContext context) {
|
||||||
|
HttpHeaders httpHeaders = headersSupplier.get();
|
||||||
|
|
||||||
|
if (httpHeaders != null && !httpHeaders.isEmpty()) {
|
||||||
|
Arrays.stream(toHeaderArray(httpHeaders)).forEach(request::addHeader);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@link org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationCallback} to configure
|
||||||
|
* the Elasticsearch RestClient's Http client with a {@link HttpAsyncClientBuilder}
|
||||||
|
*
|
||||||
|
* @since 4.4
|
||||||
|
*/
|
||||||
|
public interface ElasticsearchHttpClientConfigurationCallback
|
||||||
|
extends ClientConfiguration.ClientConfigurationCallback<HttpAsyncClientBuilder> {
|
||||||
|
|
||||||
|
static ElasticsearchHttpClientConfigurationCallback from(
|
||||||
|
Function<HttpAsyncClientBuilder, HttpAsyncClientBuilder> httpClientBuilderCallback) {
|
||||||
|
|
||||||
|
Assert.notNull(httpClientBuilderCallback, "httpClientBuilderCallback must not be null");
|
||||||
|
|
||||||
|
return httpClientBuilderCallback::apply;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* {@link org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationCallback} to configure
|
||||||
|
* the RestClient client with a {@link RestClientBuilder}
|
||||||
|
*
|
||||||
|
* @since 5.0
|
||||||
|
*/
|
||||||
|
public interface ElasticsearchRestClientConfigurationCallback
|
||||||
|
extends ClientConfiguration.ClientConfigurationCallback<RestClientBuilder> {
|
||||||
|
|
||||||
|
static ElasticsearchRestClientConfigurationCallback from(
|
||||||
|
Function<RestClientBuilder, RestClientBuilder> restClientBuilderCallback) {
|
||||||
|
|
||||||
|
Assert.notNull(restClientBuilderCallback, "restClientBuilderCallback must not be null");
|
||||||
|
|
||||||
|
return restClientBuilderCallback::apply;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
@ -20,13 +20,12 @@ import co.elastic.clients.json.JsonpMapper;
|
|||||||
import co.elastic.clients.json.jackson.JacksonJsonpMapper;
|
import co.elastic.clients.json.jackson.JacksonJsonpMapper;
|
||||||
import co.elastic.clients.transport.ElasticsearchTransport;
|
import co.elastic.clients.transport.ElasticsearchTransport;
|
||||||
import co.elastic.clients.transport.TransportOptions;
|
import co.elastic.clients.transport.TransportOptions;
|
||||||
import co.elastic.clients.transport.rest5_client.Rest5ClientOptions;
|
import co.elastic.clients.transport.rest_client.RestClientOptions;
|
||||||
import co.elastic.clients.transport.rest5_client.low_level.RequestOptions;
|
|
||||||
import co.elastic.clients.transport.rest5_client.low_level.Rest5Client;
|
|
||||||
|
|
||||||
|
import org.elasticsearch.client.RequestOptions;
|
||||||
|
import org.elasticsearch.client.RestClient;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.data.elasticsearch.client.ClientConfiguration;
|
import org.springframework.data.elasticsearch.client.ClientConfiguration;
|
||||||
import org.springframework.data.elasticsearch.client.elc.rest5_client.Rest5Clients;
|
|
||||||
import org.springframework.data.elasticsearch.config.ElasticsearchConfigurationSupport;
|
import org.springframework.data.elasticsearch.config.ElasticsearchConfigurationSupport;
|
||||||
import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
|
import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
|
||||||
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
|
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
|
||||||
@ -39,9 +38,7 @@ import com.fasterxml.jackson.databind.SerializationFeature;
|
|||||||
/**
|
/**
|
||||||
* Base class for a @{@link org.springframework.context.annotation.Configuration} class to set up the Elasticsearch
|
* Base class for a @{@link org.springframework.context.annotation.Configuration} class to set up the Elasticsearch
|
||||||
* connection using the Elasticsearch Client. This class exposes different parts of the setup as Spring beans. Deriving
|
* connection using the Elasticsearch Client. This class exposes different parts of the setup as Spring beans. Deriving
|
||||||
* classes must provide the {@link ClientConfiguration} to use. From Version 6.0 on, this class uses the new Rest5Client
|
* classes must provide the {@link ClientConfiguration} to use.
|
||||||
* from Elasticsearch 9. The old implementation using the RestClient is still available under the name
|
|
||||||
* {@link ElasticsearchLegacyRestClientConfiguration}.
|
|
||||||
*
|
*
|
||||||
* @author Peter-Josef Meisch
|
* @author Peter-Josef Meisch
|
||||||
* @since 4.4
|
* @since 4.4
|
||||||
@ -63,27 +60,27 @@ public abstract class ElasticsearchConfiguration extends ElasticsearchConfigurat
|
|||||||
* @return RestClient
|
* @return RestClient
|
||||||
*/
|
*/
|
||||||
@Bean
|
@Bean
|
||||||
public Rest5Client elasticsearchRest5Client(ClientConfiguration clientConfiguration) {
|
public RestClient elasticsearchRestClient(ClientConfiguration clientConfiguration) {
|
||||||
|
|
||||||
Assert.notNull(clientConfiguration, "clientConfiguration must not be null");
|
Assert.notNull(clientConfiguration, "clientConfiguration must not be null");
|
||||||
|
|
||||||
return Rest5Clients.getRest5Client(clientConfiguration);
|
return ElasticsearchClients.getRestClient(clientConfiguration);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides the Elasticsearch transport to be used. The default implementation uses the {@link Rest5Client} bean and
|
* Provides the Elasticsearch transport to be used. The default implementation uses the {@link RestClient} bean and
|
||||||
* the {@link JsonpMapper} bean provided in this class.
|
* the {@link JsonpMapper} bean provided in this class.
|
||||||
*
|
*
|
||||||
* @return the {@link ElasticsearchTransport}
|
* @return the {@link ElasticsearchTransport}
|
||||||
* @since 5.2
|
* @since 5.2
|
||||||
*/
|
*/
|
||||||
@Bean
|
@Bean
|
||||||
public ElasticsearchTransport elasticsearchTransport(Rest5Client rest5Client, JsonpMapper jsonpMapper) {
|
public ElasticsearchTransport elasticsearchTransport(RestClient restClient, JsonpMapper jsonpMapper) {
|
||||||
|
|
||||||
Assert.notNull(rest5Client, "restClient must not be null");
|
Assert.notNull(restClient, "restClient must not be null");
|
||||||
Assert.notNull(jsonpMapper, "jsonpMapper must not be null");
|
Assert.notNull(jsonpMapper, "jsonpMapper must not be null");
|
||||||
|
|
||||||
return ElasticsearchClients.getElasticsearchTransport(rest5Client, ElasticsearchClients.IMPERATIVE_CLIENT,
|
return ElasticsearchClients.getElasticsearchTransport(restClient, ElasticsearchClients.IMPERATIVE_CLIENT,
|
||||||
transportOptions(), jsonpMapper);
|
transportOptions(), jsonpMapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -118,7 +115,7 @@ public abstract class ElasticsearchConfiguration extends ElasticsearchConfigurat
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides the JsonpMapper bean that is used in the {@link #elasticsearchTransport(Rest5Client, JsonpMapper)} method.
|
* Provides the JsonpMapper bean that is used in the {@link #elasticsearchTransport(RestClient, JsonpMapper)} method.
|
||||||
*
|
*
|
||||||
* @return the {@link JsonpMapper} to use
|
* @return the {@link JsonpMapper} to use
|
||||||
* @since 5.2
|
* @since 5.2
|
||||||
@ -138,6 +135,6 @@ public abstract class ElasticsearchConfiguration extends ElasticsearchConfigurat
|
|||||||
* @return the options that should be added to every request. Must not be {@literal null}
|
* @return the options that should be added to every request. Must not be {@literal null}
|
||||||
*/
|
*/
|
||||||
public TransportOptions transportOptions() {
|
public TransportOptions transportOptions() {
|
||||||
return new Rest5ClientOptions(RequestOptions.DEFAULT, false);
|
return new RestClientOptions(RequestOptions.DEFAULT, false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -119,19 +119,14 @@ public class ElasticsearchExceptionTranslator implements PersistenceExceptionTra
|
|||||||
String message = null;
|
String message = null;
|
||||||
|
|
||||||
if (exception instanceof ResponseException responseException) {
|
if (exception instanceof ResponseException responseException) {
|
||||||
// this code is for the old RestClient
|
|
||||||
status = responseException.getResponse().getStatusLine().getStatusCode();
|
status = responseException.getResponse().getStatusLine().getStatusCode();
|
||||||
message = responseException.getMessage();
|
message = responseException.getMessage();
|
||||||
} else if (exception instanceof ElasticsearchException elasticsearchException) {
|
|
||||||
// using the RestClient throws this
|
|
||||||
status = elasticsearchException.status();
|
|
||||||
message = elasticsearchException.getMessage();
|
|
||||||
} else if (exception.getCause() != null) {
|
} else if (exception.getCause() != null) {
|
||||||
checkForConflictException(exception.getCause());
|
checkForConflictException(exception.getCause());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (status != null && message != null) {
|
if (status != null && message != null) {
|
||||||
if (status == 409 && message.contains("version_conflict_engine_exception"))
|
if (status == 409 && message.contains("type\":\"version_conflict_engine_exception"))
|
||||||
if (message.contains("version conflict, required seqNo")) {
|
if (message.contains("version conflict, required seqNo")) {
|
||||||
throw new OptimisticLockingFailureException("Cannot index a document due to seq_no+primary_term conflict",
|
throw new OptimisticLockingFailureException("Cannot index a document due to seq_no+primary_term conflict",
|
||||||
exception);
|
exception);
|
||||||
|
@ -1,144 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2021-2025 the original author 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.elc;
|
|
||||||
|
|
||||||
import co.elastic.clients.elasticsearch.ElasticsearchClient;
|
|
||||||
import co.elastic.clients.json.JsonpMapper;
|
|
||||||
import co.elastic.clients.json.jackson.JacksonJsonpMapper;
|
|
||||||
import co.elastic.clients.transport.ElasticsearchTransport;
|
|
||||||
import co.elastic.clients.transport.TransportOptions;
|
|
||||||
import co.elastic.clients.transport.rest_client.RestClientOptions;
|
|
||||||
|
|
||||||
import org.elasticsearch.client.RequestOptions;
|
|
||||||
import org.elasticsearch.client.RestClient;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.data.elasticsearch.client.ClientConfiguration;
|
|
||||||
import org.springframework.data.elasticsearch.client.elc.rest_client.RestClients;
|
|
||||||
import org.springframework.data.elasticsearch.config.ElasticsearchConfigurationSupport;
|
|
||||||
import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
|
|
||||||
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
|
|
||||||
import org.springframework.util.Assert;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
||||||
import com.fasterxml.jackson.databind.SerializationFeature;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Base class for a @{@link org.springframework.context.annotation.Configuration} class to set up the Elasticsearch
|
|
||||||
* connection using the Elasticsearch Client. This class exposes different parts of the setup as Spring beans. Deriving
|
|
||||||
* classes must provide the {@link ClientConfiguration} to use. <br/>
|
|
||||||
* This class uses the Elasticsearch RestClient which was replaced by the Rest5Client in Elasticsearch 9. It is still
|
|
||||||
* available here but deprecated.
|
|
||||||
*
|
|
||||||
* @author Peter-Josef Meisch
|
|
||||||
* @since 4.4
|
|
||||||
* @deprecated since 6.0, use {@link ElasticsearchConfiguration}
|
|
||||||
*/
|
|
||||||
@Deprecated(since = "6.0", forRemoval=true)
|
|
||||||
public abstract class ElasticsearchLegacyRestClientConfiguration extends ElasticsearchConfigurationSupport {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Must be implemented by deriving classes to provide the {@link ClientConfiguration}.
|
|
||||||
*
|
|
||||||
* @return configuration, must not be {@literal null}
|
|
||||||
*/
|
|
||||||
@Bean(name = "elasticsearchClientConfiguration")
|
|
||||||
public abstract ClientConfiguration clientConfiguration();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Provides the underlying low level Elasticsearch RestClient.
|
|
||||||
*
|
|
||||||
* @param clientConfiguration configuration for the client, must not be {@literal null}
|
|
||||||
* @return RestClient
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public RestClient elasticsearchRestClient(ClientConfiguration clientConfiguration) {
|
|
||||||
|
|
||||||
Assert.notNull(clientConfiguration, "clientConfiguration must not be null");
|
|
||||||
|
|
||||||
return RestClients.getRestClient(clientConfiguration);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Provides the Elasticsearch transport to be used. The default implementation uses the {@link RestClient} bean and
|
|
||||||
* the {@link JsonpMapper} bean provided in this class.
|
|
||||||
*
|
|
||||||
* @return the {@link ElasticsearchTransport}
|
|
||||||
* @since 5.2
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public ElasticsearchTransport elasticsearchTransport(RestClient restClient, JsonpMapper jsonpMapper) {
|
|
||||||
|
|
||||||
Assert.notNull(restClient, "restClient must not be null");
|
|
||||||
Assert.notNull(jsonpMapper, "jsonpMapper must not be null");
|
|
||||||
|
|
||||||
return ElasticsearchClients.getElasticsearchTransport(restClient, ElasticsearchClients.IMPERATIVE_CLIENT,
|
|
||||||
transportOptions(), jsonpMapper);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Provides the {@link ElasticsearchClient} to be used.
|
|
||||||
*
|
|
||||||
* @param transport the {@link ElasticsearchTransport} to use
|
|
||||||
* @return ElasticsearchClient instance
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public ElasticsearchClient elasticsearchClient(ElasticsearchTransport transport) {
|
|
||||||
|
|
||||||
Assert.notNull(transport, "transport must not be null");
|
|
||||||
|
|
||||||
return ElasticsearchClients.createImperative(transport);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a {@link ElasticsearchOperations} implementation using an {@link ElasticsearchClient}.
|
|
||||||
*
|
|
||||||
* @return never {@literal null}.
|
|
||||||
*/
|
|
||||||
@Bean(name = { "elasticsearchOperations", "elasticsearchTemplate" })
|
|
||||||
public ElasticsearchOperations elasticsearchOperations(ElasticsearchConverter elasticsearchConverter,
|
|
||||||
ElasticsearchClient elasticsearchClient) {
|
|
||||||
|
|
||||||
ElasticsearchTemplate template = new ElasticsearchTemplate(elasticsearchClient, elasticsearchConverter);
|
|
||||||
template.setRefreshPolicy(refreshPolicy());
|
|
||||||
|
|
||||||
return template;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Provides the JsonpMapper bean that is used in the {@link #elasticsearchTransport(RestClient, JsonpMapper)} method.
|
|
||||||
*
|
|
||||||
* @return the {@link JsonpMapper} to use
|
|
||||||
* @since 5.2
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public JsonpMapper jsonpMapper() {
|
|
||||||
// we need to create our own objectMapper that keeps null values in order to provide the storeNullValue
|
|
||||||
// functionality. The one Elasticsearch would provide removes the nulls. We remove unwanted nulls before they get
|
|
||||||
// into this mapper, so we can safely keep them here.
|
|
||||||
var objectMapper = (new ObjectMapper())
|
|
||||||
.configure(SerializationFeature.INDENT_OUTPUT, false)
|
|
||||||
.setSerializationInclusion(JsonInclude.Include.ALWAYS);
|
|
||||||
return new JacksonJsonpMapper(objectMapper);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return the options that should be added to every request. Must not be {@literal null}
|
|
||||||
*/
|
|
||||||
public TransportOptions transportOptions() {
|
|
||||||
return new RestClientOptions(RequestOptions.DEFAULT, false);
|
|
||||||
}
|
|
||||||
}
|
|
@ -40,7 +40,6 @@ import java.util.stream.Collectors;
|
|||||||
|
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.BulkFailureException;
|
import org.springframework.data.elasticsearch.BulkFailureException;
|
||||||
import org.springframework.data.elasticsearch.client.UnsupportedBackendOperation;
|
import org.springframework.data.elasticsearch.client.UnsupportedBackendOperation;
|
||||||
import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate;
|
import org.springframework.data.elasticsearch.core.AbstractElasticsearchTemplate;
|
||||||
@ -60,6 +59,7 @@ import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
|
|||||||
import org.springframework.data.elasticsearch.core.reindex.ReindexResponse;
|
import org.springframework.data.elasticsearch.core.reindex.ReindexResponse;
|
||||||
import org.springframework.data.elasticsearch.core.script.Script;
|
import org.springframework.data.elasticsearch.core.script.Script;
|
||||||
import org.springframework.data.elasticsearch.core.sql.SqlResponse;
|
import org.springframework.data.elasticsearch.core.sql.SqlResponse;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -181,6 +181,19 @@ public class ElasticsearchTemplate extends AbstractElasticsearchTemplate {
|
|||||||
return delete(query, clazz, getIndexCoordinatesFor(clazz));
|
return delete(query, clazz, getIndexCoordinatesFor(clazz));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ByQueryResponse delete(Query query, Class<?> clazz, IndexCoordinates index) {
|
||||||
|
|
||||||
|
Assert.notNull(query, "query must not be null");
|
||||||
|
|
||||||
|
DeleteByQueryRequest request = requestConverter.documentDeleteByQueryRequest(query, routingResolver.getRouting(),
|
||||||
|
clazz, index, getRefreshPolicy());
|
||||||
|
|
||||||
|
DeleteByQueryResponse response = execute(client -> client.deleteByQuery(request));
|
||||||
|
|
||||||
|
return responseConverter.byQueryResponse(response);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ByQueryResponse delete(DeleteQuery query, Class<?> clazz, IndexCoordinates index) {
|
public ByQueryResponse delete(DeleteQuery query, Class<?> clazz, IndexCoordinates index) {
|
||||||
Assert.notNull(query, "query must not be null");
|
Assert.notNull(query, "query must not be null");
|
||||||
|
@ -20,7 +20,6 @@ import static org.springframework.data.elasticsearch.client.elc.TypeUtils.*;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
|
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
|
||||||
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
|
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
|
||||||
import org.springframework.data.elasticsearch.core.query.highlight.Highlight;
|
import org.springframework.data.elasticsearch.core.query.highlight.Highlight;
|
||||||
@ -28,6 +27,7 @@ import org.springframework.data.elasticsearch.core.query.highlight.HighlightFiel
|
|||||||
import org.springframework.data.elasticsearch.core.query.highlight.HighlightFieldParameters;
|
import org.springframework.data.elasticsearch.core.query.highlight.HighlightFieldParameters;
|
||||||
import org.springframework.data.elasticsearch.core.query.highlight.HighlightParameters;
|
import org.springframework.data.elasticsearch.core.query.highlight.HighlightParameters;
|
||||||
import org.springframework.data.mapping.context.MappingContext;
|
import org.springframework.data.mapping.context.MappingContext;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -43,8 +43,7 @@ class HighlightQueryBuilder {
|
|||||||
private final RequestConverter requestConverter;
|
private final RequestConverter requestConverter;
|
||||||
|
|
||||||
HighlightQueryBuilder(
|
HighlightQueryBuilder(
|
||||||
MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext,
|
MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext, RequestConverter requestConverter) {
|
||||||
RequestConverter requestConverter) {
|
|
||||||
this.mappingContext = mappingContext;
|
this.mappingContext = mappingContext;
|
||||||
this.requestConverter = requestConverter;
|
this.requestConverter = requestConverter;
|
||||||
}
|
}
|
||||||
|
@ -27,7 +27,6 @@ import java.util.Map;
|
|||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.core.annotation.AnnotatedElementUtils;
|
import org.springframework.core.annotation.AnnotatedElementUtils;
|
||||||
import org.springframework.dao.InvalidDataAccessApiUsageException;
|
import org.springframework.dao.InvalidDataAccessApiUsageException;
|
||||||
import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
|
import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
|
||||||
@ -50,6 +49,7 @@ import org.springframework.data.elasticsearch.core.mapping.Alias;
|
|||||||
import org.springframework.data.elasticsearch.core.mapping.CreateIndexSettings;
|
import org.springframework.data.elasticsearch.core.mapping.CreateIndexSettings;
|
||||||
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
|
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
|
||||||
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
|
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -23,7 +23,7 @@ import java.nio.charset.StandardCharsets;
|
|||||||
|
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.jspecify.annotations.Nullable;
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Peter-Josef Meisch
|
* @author Peter-Josef Meisch
|
||||||
@ -48,7 +48,7 @@ final class JsonUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
public static String queryToJson(co.elastic.clients.elasticsearch._types.query_dsl.@Nullable Query query,
|
public static String queryToJson(@Nullable co.elastic.clients.elasticsearch._types.query_dsl.Query query,
|
||||||
JsonpMapper mapper) {
|
JsonpMapper mapper) {
|
||||||
|
|
||||||
if (query == null) {
|
if (query == null) {
|
||||||
|
@ -28,8 +28,8 @@ import java.util.LinkedHashMap;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.query.BaseQuery;
|
import org.springframework.data.elasticsearch.core.query.BaseQuery;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -44,7 +44,7 @@ import org.springframework.util.Assert;
|
|||||||
public class NativeQuery extends BaseQuery {
|
public class NativeQuery extends BaseQuery {
|
||||||
|
|
||||||
@Nullable private final Query query;
|
@Nullable private final Query query;
|
||||||
private org.springframework.data.elasticsearch.core.query.@Nullable Query springDataQuery;
|
@Nullable private org.springframework.data.elasticsearch.core.query.Query springDataQuery;
|
||||||
@Nullable private Query filter;
|
@Nullable private Query filter;
|
||||||
// note: the new client does not have pipeline aggs, these are just set up as normal aggs
|
// note: the new client does not have pipeline aggs, these are just set up as normal aggs
|
||||||
private final Map<String, Aggregation> aggregations = new LinkedHashMap<>();
|
private final Map<String, Aggregation> aggregations = new LinkedHashMap<>();
|
||||||
@ -117,7 +117,7 @@ public class NativeQuery extends BaseQuery {
|
|||||||
* @see NativeQueryBuilder#withQuery(org.springframework.data.elasticsearch.core.query.Query).
|
* @see NativeQueryBuilder#withQuery(org.springframework.data.elasticsearch.core.query.Query).
|
||||||
* @since 5.1
|
* @since 5.1
|
||||||
*/
|
*/
|
||||||
public void setSpringDataQuery(org.springframework.data.elasticsearch.core.query.@Nullable Query springDataQuery) {
|
public void setSpringDataQuery(@Nullable org.springframework.data.elasticsearch.core.query.Query springDataQuery) {
|
||||||
this.springDataQuery = springDataQuery;
|
this.springDataQuery = springDataQuery;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -129,7 +129,8 @@ public class NativeQuery extends BaseQuery {
|
|||||||
return knnSearches;
|
return knnSearches;
|
||||||
}
|
}
|
||||||
|
|
||||||
public org.springframework.data.elasticsearch.core.query.@Nullable Query getSpringDataQuery() {
|
@Nullable
|
||||||
|
public org.springframework.data.elasticsearch.core.query.Query getSpringDataQuery() {
|
||||||
return springDataQuery;
|
return springDataQuery;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -33,8 +33,8 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.query.BaseQueryBuilder;
|
import org.springframework.data.elasticsearch.core.query.BaseQueryBuilder;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -53,7 +53,7 @@ public class NativeQueryBuilder extends BaseQueryBuilder<NativeQuery, NativeQuer
|
|||||||
private final List<SortOptions> sortOptions = new ArrayList<>();
|
private final List<SortOptions> sortOptions = new ArrayList<>();
|
||||||
private final Map<String, JsonData> searchExtensions = new LinkedHashMap<>();
|
private final Map<String, JsonData> searchExtensions = new LinkedHashMap<>();
|
||||||
|
|
||||||
private org.springframework.data.elasticsearch.core.query.@Nullable Query springDataQuery;
|
@Nullable private org.springframework.data.elasticsearch.core.query.Query springDataQuery;
|
||||||
@Nullable private KnnQuery knnQuery;
|
@Nullable private KnnQuery knnQuery;
|
||||||
@Nullable private List<KnnSearch> knnSearches = Collections.emptyList();
|
@Nullable private List<KnnSearch> knnSearches = Collections.emptyList();
|
||||||
|
|
||||||
@ -104,7 +104,8 @@ public class NativeQueryBuilder extends BaseQueryBuilder<NativeQuery, NativeQuer
|
|||||||
return knnSearches;
|
return knnSearches;
|
||||||
}
|
}
|
||||||
|
|
||||||
public org.springframework.data.elasticsearch.core.query.@Nullable Query getSpringDataQuery() {
|
@Nullable
|
||||||
|
public org.springframework.data.elasticsearch.core.query.Query getSpringDataQuery() {
|
||||||
return springDataQuery;
|
return springDataQuery;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -34,9 +34,9 @@ import java.util.Base64;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.geo.GeoPoint;
|
import org.springframework.data.elasticsearch.core.geo.GeoPoint;
|
||||||
import org.springframework.data.elasticsearch.core.query.BaseQueryBuilder;
|
import org.springframework.data.elasticsearch.core.query.BaseQueryBuilder;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -30,7 +30,7 @@ import reactor.core.publisher.Mono;
|
|||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -16,15 +16,7 @@
|
|||||||
package org.springframework.data.elasticsearch.client.elc;
|
package org.springframework.data.elasticsearch.client.elc;
|
||||||
|
|
||||||
import co.elastic.clients.ApiClient;
|
import co.elastic.clients.ApiClient;
|
||||||
import co.elastic.clients.elasticsearch.cluster.DeleteComponentTemplateRequest;
|
import co.elastic.clients.elasticsearch.cluster.*;
|
||||||
import co.elastic.clients.elasticsearch.cluster.DeleteComponentTemplateResponse;
|
|
||||||
import co.elastic.clients.elasticsearch.cluster.ExistsComponentTemplateRequest;
|
|
||||||
import co.elastic.clients.elasticsearch.cluster.GetComponentTemplateRequest;
|
|
||||||
import co.elastic.clients.elasticsearch.cluster.GetComponentTemplateResponse;
|
|
||||||
import co.elastic.clients.elasticsearch.cluster.HealthRequest;
|
|
||||||
import co.elastic.clients.elasticsearch.cluster.HealthResponse;
|
|
||||||
import co.elastic.clients.elasticsearch.cluster.PutComponentTemplateRequest;
|
|
||||||
import co.elastic.clients.elasticsearch.cluster.PutComponentTemplateResponse;
|
|
||||||
import co.elastic.clients.transport.ElasticsearchTransport;
|
import co.elastic.clients.transport.ElasticsearchTransport;
|
||||||
import co.elastic.clients.transport.TransportOptions;
|
import co.elastic.clients.transport.TransportOptions;
|
||||||
import co.elastic.clients.transport.endpoints.BooleanResponse;
|
import co.elastic.clients.transport.endpoints.BooleanResponse;
|
||||||
@ -33,7 +25,7 @@ import reactor.core.publisher.Mono;
|
|||||||
|
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reactive version of the {@link co.elastic.clients.elasticsearch.cluster.ElasticsearchClusterClient}
|
* Reactive version of the {@link co.elastic.clients.elasticsearch.cluster.ElasticsearchClusterClient}
|
||||||
|
@ -19,18 +19,12 @@ import co.elastic.clients.json.JsonpMapper;
|
|||||||
import co.elastic.clients.json.jackson.JacksonJsonpMapper;
|
import co.elastic.clients.json.jackson.JacksonJsonpMapper;
|
||||||
import co.elastic.clients.transport.ElasticsearchTransport;
|
import co.elastic.clients.transport.ElasticsearchTransport;
|
||||||
import co.elastic.clients.transport.TransportOptions;
|
import co.elastic.clients.transport.TransportOptions;
|
||||||
import co.elastic.clients.transport.rest5_client.Rest5ClientOptions;
|
|
||||||
import co.elastic.clients.transport.rest5_client.low_level.RequestOptions;
|
|
||||||
import co.elastic.clients.transport.rest5_client.low_level.Rest5Client;
|
|
||||||
import co.elastic.clients.transport.rest_client.RestClientOptions;
|
import co.elastic.clients.transport.rest_client.RestClientOptions;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
import org.elasticsearch.client.RequestOptions;
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
||||||
import com.fasterxml.jackson.databind.SerializationFeature;
|
|
||||||
import org.elasticsearch.client.RestClient;
|
import org.elasticsearch.client.RestClient;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.data.elasticsearch.client.ClientConfiguration;
|
import org.springframework.data.elasticsearch.client.ClientConfiguration;
|
||||||
import org.springframework.data.elasticsearch.client.elc.rest5_client.Rest5Clients;
|
|
||||||
import org.springframework.data.elasticsearch.config.ElasticsearchConfigurationSupport;
|
import org.springframework.data.elasticsearch.config.ElasticsearchConfigurationSupport;
|
||||||
import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
|
import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
|
||||||
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
|
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
|
||||||
@ -61,11 +55,11 @@ public abstract class ReactiveElasticsearchConfiguration extends ElasticsearchCo
|
|||||||
* @return RestClient
|
* @return RestClient
|
||||||
*/
|
*/
|
||||||
@Bean
|
@Bean
|
||||||
public Rest5Client elasticsearchRestClient(ClientConfiguration clientConfiguration) {
|
public RestClient elasticsearchRestClient(ClientConfiguration clientConfiguration) {
|
||||||
|
|
||||||
Assert.notNull(clientConfiguration, "clientConfiguration must not be null");
|
Assert.notNull(clientConfiguration, "clientConfiguration must not be null");
|
||||||
|
|
||||||
return Rest5Clients.getRest5Client(clientConfiguration);
|
return ElasticsearchClients.getRestClient(clientConfiguration);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -76,12 +70,12 @@ public abstract class ReactiveElasticsearchConfiguration extends ElasticsearchCo
|
|||||||
* @since 5.2
|
* @since 5.2
|
||||||
*/
|
*/
|
||||||
@Bean
|
@Bean
|
||||||
public ElasticsearchTransport elasticsearchTransport(Rest5Client rest5Client, JsonpMapper jsonpMapper) {
|
public ElasticsearchTransport elasticsearchTransport(RestClient restClient, JsonpMapper jsonpMapper) {
|
||||||
|
|
||||||
Assert.notNull(rest5Client, "restClient must not be null");
|
Assert.notNull(restClient, "restClient must not be null");
|
||||||
Assert.notNull(jsonpMapper, "jsonpMapper must not be null");
|
Assert.notNull(jsonpMapper, "jsonpMapper must not be null");
|
||||||
|
|
||||||
return ElasticsearchClients.getElasticsearchTransport(rest5Client, ElasticsearchClients.REACTIVE_CLIENT,
|
return ElasticsearchClients.getElasticsearchTransport(restClient, ElasticsearchClients.REACTIVE_CLIENT,
|
||||||
transportOptions(), jsonpMapper);
|
transportOptions(), jsonpMapper);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -116,7 +110,7 @@ public abstract class ReactiveElasticsearchConfiguration extends ElasticsearchCo
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides the JsonpMapper that is used in the {@link #elasticsearchTransport(Rest5Client, JsonpMapper)} method and
|
* Provides the JsonpMapper that is used in the {@link #elasticsearchTransport(RestClient, JsonpMapper)} method and
|
||||||
* exposes it as a bean.
|
* exposes it as a bean.
|
||||||
*
|
*
|
||||||
* @return the {@link JsonpMapper} to use
|
* @return the {@link JsonpMapper} to use
|
||||||
@ -124,19 +118,13 @@ public abstract class ReactiveElasticsearchConfiguration extends ElasticsearchCo
|
|||||||
*/
|
*/
|
||||||
@Bean
|
@Bean
|
||||||
public JsonpMapper jsonpMapper() {
|
public JsonpMapper jsonpMapper() {
|
||||||
// we need to create our own objectMapper that keeps null values in order to provide the storeNullValue
|
return new JacksonJsonpMapper();
|
||||||
// functionality. The one Elasticsearch would provide removes the nulls. We remove unwanted nulls before they get
|
|
||||||
// into this mapper, so we can safely keep them here.
|
|
||||||
var objectMapper = (new ObjectMapper())
|
|
||||||
.configure(SerializationFeature.INDENT_OUTPUT, false)
|
|
||||||
.setSerializationInclusion(JsonInclude.Include.ALWAYS);
|
|
||||||
return new JacksonJsonpMapper(objectMapper);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the options that should be added to every request. Must not be {@literal null}
|
* @return the options that should be added to every request. Must not be {@literal null}
|
||||||
*/
|
*/
|
||||||
public TransportOptions transportOptions() {
|
public TransportOptions transportOptions() {
|
||||||
return new Rest5ClientOptions(RequestOptions.DEFAULT, false);
|
return new RestClientOptions(RequestOptions.DEFAULT, false).toBuilder().build();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -25,7 +25,7 @@ import reactor.core.publisher.Mono;
|
|||||||
|
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reactive version of the {@link co.elastic.clients.elasticsearch.indices.ElasticsearchIndicesClient}
|
* Reactive version of the {@link co.elastic.clients.elasticsearch.indices.ElasticsearchIndicesClient}
|
||||||
@ -539,6 +539,14 @@ public class ReactiveElasticsearchIndicesClient
|
|||||||
return stats(builder -> builder);
|
return stats(builder -> builder);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public Mono<UnfreezeResponse> unfreeze(UnfreezeRequest request) {
|
||||||
|
return Mono.fromFuture(transport.performRequestAsync(request, UnfreezeRequest._ENDPOINT, transportOptions));
|
||||||
|
}
|
||||||
|
|
||||||
|
public Mono<UnfreezeResponse> unfreeze(Function<UnfreezeRequest.Builder, ObjectBuilder<UnfreezeRequest>> fn) {
|
||||||
|
return unfreeze(fn.apply(new UnfreezeRequest.Builder()).build());
|
||||||
|
}
|
||||||
|
|
||||||
public Mono<UpdateAliasesResponse> updateAliases(UpdateAliasesRequest request) {
|
public Mono<UpdateAliasesResponse> updateAliases(UpdateAliasesRequest request) {
|
||||||
return Mono.fromFuture(transport.performRequestAsync(request, UpdateAliasesRequest._ENDPOINT, transportOptions));
|
return Mono.fromFuture(transport.performRequestAsync(request, UpdateAliasesRequest._ENDPOINT, transportOptions));
|
||||||
}
|
}
|
||||||
|
@ -1,144 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2021-2025 the original author 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.elc;
|
|
||||||
|
|
||||||
import co.elastic.clients.json.JsonpMapper;
|
|
||||||
import co.elastic.clients.json.jackson.JacksonJsonpMapper;
|
|
||||||
import co.elastic.clients.transport.ElasticsearchTransport;
|
|
||||||
import co.elastic.clients.transport.TransportOptions;
|
|
||||||
import co.elastic.clients.transport.rest_client.RestClientOptions;
|
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonInclude;
|
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
||||||
import com.fasterxml.jackson.databind.SerializationFeature;
|
|
||||||
import org.elasticsearch.client.RequestOptions;
|
|
||||||
import org.elasticsearch.client.RestClient;
|
|
||||||
import org.springframework.context.annotation.Bean;
|
|
||||||
import org.springframework.data.elasticsearch.client.ClientConfiguration;
|
|
||||||
import org.springframework.data.elasticsearch.client.elc.rest_client.RestClients;
|
|
||||||
import org.springframework.data.elasticsearch.config.ElasticsearchConfigurationSupport;
|
|
||||||
import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
|
|
||||||
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
|
|
||||||
import org.springframework.util.Assert;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Base class for a @{@link org.springframework.context.annotation.Configuration} class to set up the Elasticsearch
|
|
||||||
* connection using the {@link ReactiveElasticsearchClient}. This class exposes different parts of the setup as Spring
|
|
||||||
* beans. Deriving * classes must provide the {@link ClientConfiguration} to use. <br/>
|
|
||||||
* This class uses the Elasticsearch RestClient which was replaced b y the Rest5Client in Elasticsearch 9. It is still
|
|
||||||
* available here but deprecated. *
|
|
||||||
*
|
|
||||||
* @author Peter-Josef Meisch
|
|
||||||
* @since 4.4
|
|
||||||
* @deprecated since 6.0 use {@link ReactiveElasticsearchConfiguration}
|
|
||||||
*/
|
|
||||||
@Deprecated(since = "6.0", forRemoval=true)
|
|
||||||
public abstract class ReactiveElasticsearchLegacyRestClientConfiguration extends ElasticsearchConfigurationSupport {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Must be implemented by deriving classes to provide the {@link ClientConfiguration}.
|
|
||||||
*
|
|
||||||
* @return configuration, must not be {@literal null}
|
|
||||||
*/
|
|
||||||
@Bean(name = "elasticsearchClientConfiguration")
|
|
||||||
public abstract ClientConfiguration clientConfiguration();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Provides the underlying low level RestClient.
|
|
||||||
*
|
|
||||||
* @param clientConfiguration configuration for the client, must not be {@literal null}
|
|
||||||
* @return RestClient
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public RestClient elasticsearchRestClient(ClientConfiguration clientConfiguration) {
|
|
||||||
|
|
||||||
Assert.notNull(clientConfiguration, "clientConfiguration must not be null");
|
|
||||||
|
|
||||||
return RestClients.getRestClient(clientConfiguration);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Provides the Elasticsearch transport to be used. The default implementation uses the {@link RestClient} bean and
|
|
||||||
* the {@link JsonpMapper} bean provided in this class.
|
|
||||||
*
|
|
||||||
* @return the {@link ElasticsearchTransport}
|
|
||||||
* @since 5.2
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public ElasticsearchTransport elasticsearchTransport(RestClient restClient, JsonpMapper jsonpMapper) {
|
|
||||||
|
|
||||||
Assert.notNull(restClient, "restClient must not be null");
|
|
||||||
Assert.notNull(jsonpMapper, "jsonpMapper must not be null");
|
|
||||||
|
|
||||||
return ElasticsearchClients.getElasticsearchTransport(restClient, ElasticsearchClients.REACTIVE_CLIENT,
|
|
||||||
transportOptions(), jsonpMapper);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Provides the {@link ReactiveElasticsearchClient} instance used.
|
|
||||||
*
|
|
||||||
* @param transport the ElasticsearchTransport to use
|
|
||||||
* @return ReactiveElasticsearchClient instance.
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public ReactiveElasticsearchClient reactiveElasticsearchClient(ElasticsearchTransport transport) {
|
|
||||||
|
|
||||||
Assert.notNull(transport, "transport must not be null");
|
|
||||||
|
|
||||||
return ElasticsearchClients.createReactive(transport);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates {@link ReactiveElasticsearchOperations}.
|
|
||||||
*
|
|
||||||
* @return never {@literal null}.
|
|
||||||
*/
|
|
||||||
@Bean(name = { "reactiveElasticsearchOperations", "reactiveElasticsearchTemplate" })
|
|
||||||
public ReactiveElasticsearchOperations reactiveElasticsearchOperations(ElasticsearchConverter elasticsearchConverter,
|
|
||||||
ReactiveElasticsearchClient reactiveElasticsearchClient) {
|
|
||||||
|
|
||||||
ReactiveElasticsearchTemplate template = new ReactiveElasticsearchTemplate(reactiveElasticsearchClient,
|
|
||||||
elasticsearchConverter);
|
|
||||||
template.setRefreshPolicy(refreshPolicy());
|
|
||||||
|
|
||||||
return template;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Provides the JsonpMapper that is used in the {@link #elasticsearchTransport(RestClient, JsonpMapper)} method and
|
|
||||||
* exposes it as a bean.
|
|
||||||
*
|
|
||||||
* @return the {@link JsonpMapper} to use
|
|
||||||
* @since 5.2
|
|
||||||
*/
|
|
||||||
@Bean
|
|
||||||
public JsonpMapper jsonpMapper() {
|
|
||||||
// we need to create our own objectMapper that keeps null values in order to provide the storeNullValue
|
|
||||||
// functionality. The one Elasticsearch would provide removes the nulls. We remove unwanted nulls before they get
|
|
||||||
// into this mapper, so we can safely keep them here.
|
|
||||||
var objectMapper = (new ObjectMapper())
|
|
||||||
.configure(SerializationFeature.INDENT_OUTPUT, false)
|
|
||||||
.setSerializationInclusion(JsonInclude.Include.ALWAYS);
|
|
||||||
return new JacksonJsonpMapper(objectMapper);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @return the options that should be added to every request. Must not be {@literal null}
|
|
||||||
*/
|
|
||||||
public TransportOptions transportOptions() {
|
|
||||||
return new RestClientOptions(RequestOptions.DEFAULT, false).toBuilder().build();
|
|
||||||
}
|
|
||||||
}
|
|
@ -40,7 +40,6 @@ import java.util.stream.Collectors;
|
|||||||
|
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.reactivestreams.Publisher;
|
import org.reactivestreams.Publisher;
|
||||||
import org.springframework.data.domain.Sort;
|
import org.springframework.data.domain.Sort;
|
||||||
import org.springframework.data.elasticsearch.BulkFailureException;
|
import org.springframework.data.elasticsearch.BulkFailureException;
|
||||||
@ -64,6 +63,7 @@ import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
|
|||||||
import org.springframework.data.elasticsearch.core.reindex.ReindexResponse;
|
import org.springframework.data.elasticsearch.core.reindex.ReindexResponse;
|
||||||
import org.springframework.data.elasticsearch.core.script.Script;
|
import org.springframework.data.elasticsearch.core.script.Script;
|
||||||
import org.springframework.data.elasticsearch.core.sql.SqlResponse;
|
import org.springframework.data.elasticsearch.core.sql.SqlResponse;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
@ -167,6 +167,16 @@ public class ReactiveElasticsearchTemplate extends AbstractReactiveElasticsearch
|
|||||||
.onErrorReturn(NoSuchIndexException.class, false);
|
.onErrorReturn(NoSuchIndexException.class, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Mono<ByQueryResponse> delete(Query query, Class<?> entityType, IndexCoordinates index) {
|
||||||
|
|
||||||
|
Assert.notNull(query, "query must not be null");
|
||||||
|
|
||||||
|
DeleteByQueryRequest request = requestConverter.documentDeleteByQueryRequest(query, routingResolver.getRouting(),
|
||||||
|
entityType, index, getRefreshPolicy());
|
||||||
|
return Mono.from(execute(client -> client.deleteByQuery(request))).map(responseConverter::byQueryResponse);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Mono<ByQueryResponse> delete(DeleteQuery query, Class<?> entityType, IndexCoordinates index) {
|
public Mono<ByQueryResponse> delete(DeleteQuery query, Class<?> entityType, IndexCoordinates index) {
|
||||||
Assert.notNull(query, "query must not be null");
|
Assert.notNull(query, "query must not be null");
|
||||||
|
@ -29,7 +29,6 @@ import java.util.Map;
|
|||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.core.annotation.AnnotatedElementUtils;
|
import org.springframework.core.annotation.AnnotatedElementUtils;
|
||||||
import org.springframework.dao.InvalidDataAccessApiUsageException;
|
import org.springframework.dao.InvalidDataAccessApiUsageException;
|
||||||
import org.springframework.data.elasticsearch.NoSuchIndexException;
|
import org.springframework.data.elasticsearch.NoSuchIndexException;
|
||||||
@ -52,6 +51,7 @@ import org.springframework.data.elasticsearch.core.mapping.Alias;
|
|||||||
import org.springframework.data.elasticsearch.core.mapping.CreateIndexSettings;
|
import org.springframework.data.elasticsearch.core.mapping.CreateIndexSettings;
|
||||||
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
|
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
|
||||||
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
|
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -42,10 +42,10 @@ import co.elastic.clients.elasticsearch.core.bulk.CreateOperation;
|
|||||||
import co.elastic.clients.elasticsearch.core.bulk.IndexOperation;
|
import co.elastic.clients.elasticsearch.core.bulk.IndexOperation;
|
||||||
import co.elastic.clients.elasticsearch.core.bulk.UpdateOperation;
|
import co.elastic.clients.elasticsearch.core.bulk.UpdateOperation;
|
||||||
import co.elastic.clients.elasticsearch.core.mget.MultiGetOperation;
|
import co.elastic.clients.elasticsearch.core.mget.MultiGetOperation;
|
||||||
|
import co.elastic.clients.elasticsearch.core.msearch.MultisearchBody;
|
||||||
import co.elastic.clients.elasticsearch.core.msearch.MultisearchHeader;
|
import co.elastic.clients.elasticsearch.core.msearch.MultisearchHeader;
|
||||||
import co.elastic.clients.elasticsearch.core.search.Highlight;
|
import co.elastic.clients.elasticsearch.core.search.Highlight;
|
||||||
import co.elastic.clients.elasticsearch.core.search.Rescore;
|
import co.elastic.clients.elasticsearch.core.search.Rescore;
|
||||||
import co.elastic.clients.elasticsearch.core.search.SearchRequestBody;
|
|
||||||
import co.elastic.clients.elasticsearch.core.search.SourceConfig;
|
import co.elastic.clients.elasticsearch.core.search.SourceConfig;
|
||||||
import co.elastic.clients.elasticsearch.indices.*;
|
import co.elastic.clients.elasticsearch.indices.*;
|
||||||
import co.elastic.clients.elasticsearch.indices.ExistsIndexTemplateRequest;
|
import co.elastic.clients.elasticsearch.indices.ExistsIndexTemplateRequest;
|
||||||
@ -55,7 +55,6 @@ import co.elastic.clients.elasticsearch.sql.query.SqlFormat;
|
|||||||
import co.elastic.clients.json.JsonData;
|
import co.elastic.clients.json.JsonData;
|
||||||
import co.elastic.clients.json.JsonpDeserializer;
|
import co.elastic.clients.json.JsonpDeserializer;
|
||||||
import co.elastic.clients.json.JsonpMapper;
|
import co.elastic.clients.json.JsonpMapper;
|
||||||
import co.elastic.clients.util.NamedValue;
|
|
||||||
import co.elastic.clients.util.ObjectBuilder;
|
import co.elastic.clients.util.ObjectBuilder;
|
||||||
import jakarta.json.stream.JsonParser;
|
import jakarta.json.stream.JsonParser;
|
||||||
|
|
||||||
@ -73,12 +72,10 @@ import java.util.Objects;
|
|||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
|
||||||
|
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.dao.InvalidDataAccessApiUsageException;
|
import org.springframework.dao.InvalidDataAccessApiUsageException;
|
||||||
import org.springframework.data.domain.Sort;
|
import org.springframework.data.domain.Sort;
|
||||||
import org.springframework.data.elasticsearch.core.RefreshPolicy;
|
import org.springframework.data.elasticsearch.core.RefreshPolicy;
|
||||||
@ -102,6 +99,7 @@ import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
|
|||||||
import org.springframework.data.elasticsearch.core.reindex.Remote;
|
import org.springframework.data.elasticsearch.core.reindex.Remote;
|
||||||
import org.springframework.data.elasticsearch.core.script.Script;
|
import org.springframework.data.elasticsearch.core.script.Script;
|
||||||
import org.springframework.data.elasticsearch.support.DefaultStringObjectMap;
|
import org.springframework.data.elasticsearch.support.DefaultStringObjectMap;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
@ -738,7 +736,8 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
return uob.build();
|
return uob.build();
|
||||||
}
|
}
|
||||||
|
|
||||||
private co.elastic.clients.elasticsearch._types.@Nullable Script getScript(@Nullable ScriptData scriptData) {
|
@Nullable
|
||||||
|
private co.elastic.clients.elasticsearch._types.Script getScript(@Nullable ScriptData scriptData) {
|
||||||
|
|
||||||
if (scriptData == null) {
|
if (scriptData == null) {
|
||||||
return null;
|
return null;
|
||||||
@ -751,10 +750,11 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
}
|
}
|
||||||
return co.elastic.clients.elasticsearch._types.Script.of(sb -> {
|
return co.elastic.clients.elasticsearch._types.Script.of(sb -> {
|
||||||
sb.lang(scriptData.language())
|
sb.lang(scriptData.language())
|
||||||
.params(params)
|
.params(params);
|
||||||
.id(scriptData.scriptName());
|
if (scriptData.type() == ScriptType.INLINE) {
|
||||||
if (scriptData.script() != null){
|
sb.source(scriptData.script());
|
||||||
sb.source(s -> s.scriptString(scriptData.script()));
|
} else if (scriptData.type() == ScriptType.STORED) {
|
||||||
|
sb.id(scriptData.script());
|
||||||
}
|
}
|
||||||
return sb;
|
return sb;
|
||||||
});
|
});
|
||||||
@ -926,13 +926,9 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
|
|
||||||
ReindexRequest.Script script = reindexRequest.getScript();
|
ReindexRequest.Script script = reindexRequest.getScript();
|
||||||
if (script != null) {
|
if (script != null) {
|
||||||
builder.script(sb -> {
|
builder.script(sb -> sb
|
||||||
if (script.getSource() != null){
|
.lang(script.getLang())
|
||||||
sb.source(s -> s.scriptString(script.getSource()));
|
.source(script.getSource()));
|
||||||
}
|
|
||||||
sb.lang(script.getLang());
|
|
||||||
return sb;
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
builder.timeout(time(reindexRequest.getTimeout())) //
|
builder.timeout(time(reindexRequest.getTimeout())) //
|
||||||
@ -1089,11 +1085,12 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
|
|
||||||
uqb.script(sb -> {
|
uqb.script(sb -> {
|
||||||
sb.lang(query.getLang()).params(params);
|
sb.lang(query.getLang()).params(params);
|
||||||
if (query.getScript() != null){
|
|
||||||
sb.source(s -> s.scriptString(query.getScript()));
|
|
||||||
}
|
|
||||||
sb.id(query.getId());
|
|
||||||
|
|
||||||
|
if (query.getScriptType() == ScriptType.INLINE) {
|
||||||
|
sb.source(query.getScript()); //
|
||||||
|
} else if (query.getScriptType() == ScriptType.STORED) {
|
||||||
|
sb.id(query.getScript());
|
||||||
|
}
|
||||||
return sb;
|
return sb;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -1256,11 +1253,11 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
mtrb.searchTemplates(stb -> stb
|
mtrb.searchTemplates(stb -> stb
|
||||||
.header(msearchHeaderBuilder(query, param.index(), routing))
|
.header(msearchHeaderBuilder(query, param.index(), routing))
|
||||||
.body(bb -> {
|
.body(bb -> {
|
||||||
bb.explain(query.getExplain()) //
|
bb //
|
||||||
.id(query.getId()); //
|
.explain(query.getExplain()) //
|
||||||
if (query.getSource() != null){
|
.id(query.getId()) //
|
||||||
bb.source(s -> s.scriptString(query.getSource()));
|
.source(query.getSource()) //
|
||||||
}
|
;
|
||||||
|
|
||||||
if (!CollectionUtils.isEmpty(query.getParams())) {
|
if (!CollectionUtils.isEmpty(query.getParams())) {
|
||||||
Map<String, JsonData> params = getTemplateParams(query.getParams().entrySet());
|
Map<String, JsonData> params = getTemplateParams(query.getParams().entrySet());
|
||||||
@ -1296,15 +1293,11 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
.timeout(timeStringMs(query.getTimeout())) //
|
.timeout(timeStringMs(query.getTimeout())) //
|
||||||
;
|
;
|
||||||
|
|
||||||
var offset = query.getPageable().isPaged() ? query.getPageable().getOffset() : 0;
|
if (query.getPageable().isPaged()) {
|
||||||
var pageSize = query.getPageable().isPaged() ? query.getPageable().getPageSize()
|
bb //
|
||||||
: INDEX_MAX_RESULT_WINDOW;
|
.from((int) query.getPageable().getOffset()) //
|
||||||
// if we have both a page size and a max results, we take the min, this is necessary for
|
.size(query.getPageable().getPageSize());
|
||||||
// searchForStream to work correctly (#3098) as there the page size defines what is
|
}
|
||||||
// returned in a single request, and the max result determines the total number of
|
|
||||||
// documents returned
|
|
||||||
var size = query.isLimiting() ? Math.min(pageSize, query.getMaxResults()) : pageSize;
|
|
||||||
bb.from((int) offset).size(size);
|
|
||||||
|
|
||||||
if (!isEmpty(query.getFields())) {
|
if (!isEmpty(query.getFields())) {
|
||||||
bb.fields(fb -> {
|
bb.fields(fb -> {
|
||||||
@ -1317,6 +1310,10 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
bb.storedFields(query.getStoredFields());
|
bb.storedFields(query.getStoredFields());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (query.isLimiting()) {
|
||||||
|
bb.size(query.getMaxResults());
|
||||||
|
}
|
||||||
|
|
||||||
if (query.getMinScore() > 0) {
|
if (query.getMinScore() > 0) {
|
||||||
bb.minScore((double) query.getMinScore());
|
bb.minScore((double) query.getMinScore());
|
||||||
}
|
}
|
||||||
@ -1351,9 +1348,7 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
|
|
||||||
if (script != null) {
|
if (script != null) {
|
||||||
rfb.script(s -> {
|
rfb.script(s -> {
|
||||||
if (script != null) {
|
s.source(script);
|
||||||
s.source(so -> so.scriptString(script));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (runtimeField.getParams() != null) {
|
if (runtimeField.getParams() != null) {
|
||||||
s.params(TypeUtils.paramsMap(runtimeField.getParams()));
|
s.params(TypeUtils.paramsMap(runtimeField.getParams()));
|
||||||
@ -1370,14 +1365,9 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!isEmpty(query.getIndicesBoost())) {
|
if (!isEmpty(query.getIndicesBoost())) {
|
||||||
Stream<NamedValue<Double>> namedValueStream = query.getIndicesBoost().stream()
|
bb.indicesBoost(query.getIndicesBoost().stream()
|
||||||
.map(indexBoost -> {
|
.map(indexBoost -> Map.of(indexBoost.getIndexName(), (double) indexBoost.getBoost()))
|
||||||
var namedValue = new NamedValue(indexBoost.getIndexName(),
|
.collect(Collectors.toList()));
|
||||||
Float.valueOf(indexBoost.getBoost()).doubleValue());
|
|
||||||
return namedValue;
|
|
||||||
});
|
|
||||||
List<NamedValue<Double>> namedValueList = namedValueStream.collect(Collectors.toList());
|
|
||||||
bb.indicesBoost(namedValueList);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
query.getScriptedFields().forEach(scriptedField -> bb.scriptFields(scriptedField.getFieldName(),
|
query.getScriptedFields().forEach(scriptedField -> bb.scriptFields(scriptedField.getFieldName(),
|
||||||
@ -1476,14 +1466,13 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
builder.seqNoPrimaryTerm(true);
|
builder.seqNoPrimaryTerm(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
var offset = query.getPageable().isPaged() ? query.getPageable().getOffset() : 0;
|
if (query.getPageable().isPaged()) {
|
||||||
var pageSize = query.getPageable().isPaged() ? query.getPageable().getPageSize() : INDEX_MAX_RESULT_WINDOW;
|
builder //
|
||||||
// if we have both a page size and a max results, we take the min, this is necessary for
|
.from((int) query.getPageable().getOffset()) //
|
||||||
// searchForStream to work correctly (#3098) as there the page size defines what is
|
.size(query.getPageable().getPageSize());
|
||||||
// returned in a single request, and the max result determines the total number of
|
} else {
|
||||||
// documents returned
|
builder.from(0).size(INDEX_MAX_RESULT_WINDOW);
|
||||||
var size = query.isLimiting() ? Math.min(pageSize, query.getMaxResults()) : pageSize;
|
}
|
||||||
builder.from((int) offset).size(size);
|
|
||||||
|
|
||||||
if (!isEmpty(query.getFields())) {
|
if (!isEmpty(query.getFields())) {
|
||||||
var fieldAndFormats = query.getFields().stream().map(field -> FieldAndFormat.of(b -> b.field(field))).toList();
|
var fieldAndFormats = query.getFields().stream().map(field -> FieldAndFormat.of(b -> b.field(field))).toList();
|
||||||
@ -1498,6 +1487,10 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
addIndicesOptions(builder, query.getIndicesOptions());
|
addIndicesOptions(builder, query.getIndicesOptions());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (query.isLimiting()) {
|
||||||
|
builder.size(query.getMaxResults());
|
||||||
|
}
|
||||||
|
|
||||||
if (query.getMinScore() > 0) {
|
if (query.getMinScore() > 0) {
|
||||||
builder.minScore((double) query.getMinScore());
|
builder.minScore((double) query.getMinScore());
|
||||||
}
|
}
|
||||||
@ -1555,9 +1548,7 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
String script = runtimeField.getScript();
|
String script = runtimeField.getScript();
|
||||||
if (script != null) {
|
if (script != null) {
|
||||||
rfb.script(s -> {
|
rfb.script(s -> {
|
||||||
if (script != null) {
|
s.source(script);
|
||||||
s.source(so -> so.scriptString(script));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (runtimeField.getParams() != null) {
|
if (runtimeField.getParams() != null) {
|
||||||
s.params(TypeUtils.paramsMap(runtimeField.getParams()));
|
s.params(TypeUtils.paramsMap(runtimeField.getParams()));
|
||||||
@ -1585,14 +1576,9 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!isEmpty(query.getIndicesBoost())) {
|
if (!isEmpty(query.getIndicesBoost())) {
|
||||||
Stream<NamedValue<Double>> namedValueStream = query.getIndicesBoost().stream()
|
builder.indicesBoost(query.getIndicesBoost().stream()
|
||||||
.map(indexBoost -> {
|
.map(indexBoost -> Map.of(indexBoost.getIndexName(), (double) indexBoost.getBoost()))
|
||||||
var namedValue = new NamedValue(indexBoost.getIndexName(),
|
.collect(Collectors.toList()));
|
||||||
Float.valueOf(indexBoost.getBoost()).doubleValue());
|
|
||||||
return namedValue;
|
|
||||||
});
|
|
||||||
List<NamedValue<Double>> namedValueList = namedValueStream.collect(Collectors.toList());
|
|
||||||
builder.indicesBoost(namedValueList);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isEmpty(query.getDocValueFields())) {
|
if (!isEmpty(query.getDocValueFields())) {
|
||||||
@ -1654,7 +1640,7 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
builder.highlight(highlight);
|
builder.highlight(highlight);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addHighlight(Query query, SearchRequestBody.Builder builder) {
|
private void addHighlight(Query query, MultisearchBody.Builder builder) {
|
||||||
|
|
||||||
Highlight highlight = query.getHighlightQuery()
|
Highlight highlight = query.getHighlightQuery()
|
||||||
.map(highlightQuery -> new HighlightQueryBuilder(elasticsearchConverter.getMappingContext(), this)
|
.map(highlightQuery -> new HighlightQueryBuilder(elasticsearchConverter.getMappingContext(), this)
|
||||||
@ -1734,7 +1720,7 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
private NestedSortValue getNestedSort(Order.@Nullable Nested nested,
|
private NestedSortValue getNestedSort(@Nullable Order.Nested nested,
|
||||||
@Nullable ElasticsearchPersistentEntity<?> persistentEntity) {
|
@Nullable ElasticsearchPersistentEntity<?> persistentEntity) {
|
||||||
return (nested == null || persistentEntity == null) ? null
|
return (nested == null || persistentEntity == null) ? null
|
||||||
: NestedSortValue.of(b -> b //
|
: NestedSortValue.of(b -> b //
|
||||||
@ -1778,7 +1764,7 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@SuppressWarnings("DuplicatedCode")
|
@SuppressWarnings("DuplicatedCode")
|
||||||
private void prepareNativeSearch(NativeQuery query, SearchRequestBody.Builder builder) {
|
private void prepareNativeSearch(NativeQuery query, MultisearchBody.Builder builder) {
|
||||||
|
|
||||||
builder //
|
builder //
|
||||||
.suggest(query.getSuggester()) //
|
.suggest(query.getSuggester()) //
|
||||||
@ -1798,7 +1784,8 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
co.elastic.clients.elasticsearch._types.query_dsl.@Nullable Query getQuery(@Nullable Query query,
|
@Nullable
|
||||||
|
co.elastic.clients.elasticsearch._types.query_dsl.Query getQuery(@Nullable Query query,
|
||||||
@Nullable Class<?> clazz) {
|
@Nullable Class<?> clazz) {
|
||||||
return getEsQuery(query, (q) -> elasticsearchConverter.updateQuery(q, clazz));
|
return getEsQuery(query, (q) -> elasticsearchConverter.updateQuery(q, clazz));
|
||||||
}
|
}
|
||||||
@ -1897,11 +1884,10 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
.id(query.getId()) //
|
.id(query.getId()) //
|
||||||
.index(Arrays.asList(index.getIndexNames())) //
|
.index(Arrays.asList(index.getIndexNames())) //
|
||||||
.preference(query.getPreference()) //
|
.preference(query.getPreference()) //
|
||||||
.searchType(searchType(query.getSearchType())); //
|
.searchType(searchType(query.getSearchType())) //
|
||||||
|
.source(query.getSource()) //
|
||||||
|
;
|
||||||
|
|
||||||
if (query.getSource() != null) {
|
|
||||||
builder.source(so -> so.scriptString(query.getSource()));
|
|
||||||
}
|
|
||||||
if (query.getRoute() != null) {
|
if (query.getRoute() != null) {
|
||||||
builder.routing(query.getRoute());
|
builder.routing(query.getRoute());
|
||||||
} else if (StringUtils.hasText(routing)) {
|
} else if (StringUtils.hasText(routing)) {
|
||||||
@ -1944,7 +1930,7 @@ class RequestConverter extends AbstractQueryProcessor {
|
|||||||
.id(script.id()) //
|
.id(script.id()) //
|
||||||
.script(sb -> sb //
|
.script(sb -> sb //
|
||||||
.lang(script.language()) //
|
.lang(script.language()) //
|
||||||
.source(s -> s.scriptString(script.source()))));
|
.source(script.source())));
|
||||||
}
|
}
|
||||||
|
|
||||||
public GetScriptRequest scriptGet(String name) {
|
public GetScriptRequest scriptGet(String name) {
|
||||||
|
@ -48,7 +48,6 @@ import java.util.stream.Collectors;
|
|||||||
|
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.ElasticsearchErrorCause;
|
import org.springframework.data.elasticsearch.ElasticsearchErrorCause;
|
||||||
import org.springframework.data.elasticsearch.core.IndexInformation;
|
import org.springframework.data.elasticsearch.core.IndexInformation;
|
||||||
import org.springframework.data.elasticsearch.core.MultiGetItem;
|
import org.springframework.data.elasticsearch.core.MultiGetItem;
|
||||||
@ -66,6 +65,7 @@ import org.springframework.data.elasticsearch.core.reindex.ReindexResponse;
|
|||||||
import org.springframework.data.elasticsearch.core.script.Script;
|
import org.springframework.data.elasticsearch.core.script.Script;
|
||||||
import org.springframework.data.elasticsearch.core.sql.SqlResponse;
|
import org.springframework.data.elasticsearch.core.sql.SqlResponse;
|
||||||
import org.springframework.data.elasticsearch.support.DefaultStringObjectMap;
|
import org.springframework.data.elasticsearch.support.DefaultStringObjectMap;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -92,7 +92,7 @@ class ResponseConverter {
|
|||||||
return ClusterHealth.builder() //
|
return ClusterHealth.builder() //
|
||||||
.withActivePrimaryShards(healthResponse.activePrimaryShards()) //
|
.withActivePrimaryShards(healthResponse.activePrimaryShards()) //
|
||||||
.withActiveShards(healthResponse.activeShards()) //
|
.withActiveShards(healthResponse.activeShards()) //
|
||||||
.withActiveShardsPercent(healthResponse.activeShardsPercentAsNumber())//
|
.withActiveShardsPercent(Double.parseDouble(healthResponse.activeShardsPercentAsNumber()))//
|
||||||
.withClusterName(healthResponse.clusterName()) //
|
.withClusterName(healthResponse.clusterName()) //
|
||||||
.withDelayedUnassignedShards(healthResponse.delayedUnassignedShards()) //
|
.withDelayedUnassignedShards(healthResponse.delayedUnassignedShards()) //
|
||||||
.withInitializingShards(healthResponse.initializingShards()) //
|
.withInitializingShards(healthResponse.initializingShards()) //
|
||||||
@ -191,7 +191,7 @@ class ResponseConverter {
|
|||||||
Assert.notNull(getMappingResponse, "getMappingResponse must not be null");
|
Assert.notNull(getMappingResponse, "getMappingResponse must not be null");
|
||||||
Assert.notNull(indexCoordinates, "indexCoordinates must not be null");
|
Assert.notNull(indexCoordinates, "indexCoordinates must not be null");
|
||||||
|
|
||||||
Map<String, IndexMappingRecord> mappings = getMappingResponse.mappings();
|
Map<String, IndexMappingRecord> mappings = getMappingResponse.result();
|
||||||
|
|
||||||
if (mappings == null || mappings.isEmpty()) {
|
if (mappings == null || mappings.isEmpty()) {
|
||||||
return Document.create();
|
return Document.create();
|
||||||
@ -219,7 +219,7 @@ class ResponseConverter {
|
|||||||
|
|
||||||
List<IndexInformation> indexInformationList = new ArrayList<>();
|
List<IndexInformation> indexInformationList = new ArrayList<>();
|
||||||
|
|
||||||
getIndexResponse.indices().forEach((indexName, indexState) -> {
|
getIndexResponse.result().forEach((indexName, indexState) -> {
|
||||||
Settings settings = indexState.settings() != null ? Settings.parse(toJson(indexState.settings(), jsonpMapper))
|
Settings settings = indexState.settings() != null ? Settings.parse(toJson(indexState.settings(), jsonpMapper))
|
||||||
: new Settings();
|
: new Settings();
|
||||||
Document mappings = indexState.mappings() != null ? Document.parse(toJson(indexState.mappings(), jsonpMapper))
|
Document mappings = indexState.mappings() != null ? Document.parse(toJson(indexState.mappings(), jsonpMapper))
|
||||||
@ -239,7 +239,7 @@ class ResponseConverter {
|
|||||||
Assert.notNull(getAliasResponse, "getAliasResponse must not be null");
|
Assert.notNull(getAliasResponse, "getAliasResponse must not be null");
|
||||||
|
|
||||||
Map<String, Set<AliasData>> aliasDataMap = new HashMap<>();
|
Map<String, Set<AliasData>> aliasDataMap = new HashMap<>();
|
||||||
getAliasResponse.aliases().forEach((indexName, alias) -> {
|
getAliasResponse.result().forEach((indexName, alias) -> {
|
||||||
Set<AliasData> aliasDataSet = new HashSet<>();
|
Set<AliasData> aliasDataSet = new HashSet<>();
|
||||||
alias.aliases()
|
alias.aliases()
|
||||||
.forEach((aliasName, aliasDefinition) -> aliasDataSet.add(indicesGetAliasData(aliasName, aliasDefinition)));
|
.forEach((aliasName, aliasDefinition) -> aliasDataSet.add(indicesGetAliasData(aliasName, aliasDefinition)));
|
||||||
@ -400,6 +400,7 @@ class ResponseConverter {
|
|||||||
private ReindexResponse.Failure reindexResponseFailureOf(BulkIndexByScrollFailure failure) {
|
private ReindexResponse.Failure reindexResponseFailureOf(BulkIndexByScrollFailure failure) {
|
||||||
return ReindexResponse.Failure.builder() //
|
return ReindexResponse.Failure.builder() //
|
||||||
.withIndex(failure.index()) //
|
.withIndex(failure.index()) //
|
||||||
|
.withType(failure.type()) //
|
||||||
.withId(failure.id()) //
|
.withId(failure.id()) //
|
||||||
.withStatus(failure.status())//
|
.withStatus(failure.status())//
|
||||||
.withErrorCause(toErrorCause(failure.cause())) //
|
.withErrorCause(toErrorCause(failure.cause())) //
|
||||||
@ -410,12 +411,14 @@ class ResponseConverter {
|
|||||||
private ByQueryResponse.Failure byQueryResponseFailureOf(BulkIndexByScrollFailure failure) {
|
private ByQueryResponse.Failure byQueryResponseFailureOf(BulkIndexByScrollFailure failure) {
|
||||||
return ByQueryResponse.Failure.builder() //
|
return ByQueryResponse.Failure.builder() //
|
||||||
.withIndex(failure.index()) //
|
.withIndex(failure.index()) //
|
||||||
|
.withType(failure.type()) //
|
||||||
.withId(failure.id()) //
|
.withId(failure.id()) //
|
||||||
.withStatus(failure.status())//
|
.withStatus(failure.status())//
|
||||||
.withErrorCause(toErrorCause(failure.cause())).build();
|
.withErrorCause(toErrorCause(failure.cause())).build();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static MultiGetItem.@Nullable Failure getFailure(MultiGetResponseItem<EntityAsMap> itemResponse) {
|
@Nullable
|
||||||
|
public static MultiGetItem.Failure getFailure(MultiGetResponseItem<EntityAsMap> itemResponse) {
|
||||||
|
|
||||||
MultiGetError responseFailure = itemResponse.isFailure() ? itemResponse.failure() : null;
|
MultiGetError responseFailure = itemResponse.isFailure() ? itemResponse.failure() : null;
|
||||||
|
|
||||||
@ -497,10 +500,6 @@ class ResponseConverter {
|
|||||||
builder.withDeleted(response.deleted());
|
builder.withDeleted(response.deleted());
|
||||||
}
|
}
|
||||||
|
|
||||||
if(response.updated() != null) {
|
|
||||||
builder.withUpdated(response.updated());
|
|
||||||
}
|
|
||||||
|
|
||||||
if (response.batches() != null) {
|
if (response.batches() != null) {
|
||||||
builder.withBatches(Math.toIntExact(response.batches()));
|
builder.withBatches(Math.toIntExact(response.batches()));
|
||||||
}
|
}
|
||||||
@ -535,7 +534,7 @@ class ResponseConverter {
|
|||||||
? Script.builder() //
|
? Script.builder() //
|
||||||
.withId(response.id()) //
|
.withId(response.id()) //
|
||||||
.withLanguage(response.script().lang()) //
|
.withLanguage(response.script().lang()) //
|
||||||
.withSource(response.script().source().scriptString()).build() //
|
.withSource(response.script().source()).build() //
|
||||||
: null;
|
: null;
|
||||||
}
|
}
|
||||||
// endregion
|
// endregion
|
||||||
|
@ -39,7 +39,6 @@ import java.util.stream.Collectors;
|
|||||||
|
|
||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.SearchShardStatistics;
|
import org.springframework.data.elasticsearch.core.SearchShardStatistics;
|
||||||
import org.springframework.data.elasticsearch.core.TotalHitsRelation;
|
import org.springframework.data.elasticsearch.core.TotalHitsRelation;
|
||||||
import org.springframework.data.elasticsearch.core.document.SearchDocument;
|
import org.springframework.data.elasticsearch.core.document.SearchDocument;
|
||||||
@ -49,6 +48,7 @@ import org.springframework.data.elasticsearch.core.suggest.response.PhraseSugges
|
|||||||
import org.springframework.data.elasticsearch.core.suggest.response.Suggest;
|
import org.springframework.data.elasticsearch.core.suggest.response.Suggest;
|
||||||
import org.springframework.data.elasticsearch.core.suggest.response.TermSuggestion;
|
import org.springframework.data.elasticsearch.core.suggest.response.TermSuggestion;
|
||||||
import org.springframework.data.elasticsearch.support.ScoreDoc;
|
import org.springframework.data.elasticsearch.support.ScoreDoc;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
|
|
||||||
@ -133,8 +133,7 @@ class SearchDocumentResponseBuilder {
|
|||||||
* @return the {@link SearchDocumentResponse}
|
* @return the {@link SearchDocumentResponse}
|
||||||
*/
|
*/
|
||||||
public static <T> SearchDocumentResponse from(HitsMetadata<?> hitsMetadata, @Nullable ShardStatistics shards,
|
public static <T> SearchDocumentResponse from(HitsMetadata<?> hitsMetadata, @Nullable ShardStatistics shards,
|
||||||
@Nullable String scrollId, @Nullable String pointInTimeId, long executionDurationInMillis,
|
@Nullable String scrollId, @Nullable String pointInTimeId, long executionDurationInMillis, @Nullable Map<String, Aggregate> aggregations,
|
||||||
@Nullable Map<String, Aggregate> aggregations,
|
|
||||||
Map<String, List<Suggestion<EntityAsMap>>> suggestES, SearchDocumentResponse.EntityCreator<T> entityCreator,
|
Map<String, List<Suggestion<EntityAsMap>>> suggestES, SearchDocumentResponse.EntityCreator<T> entityCreator,
|
||||||
JsonpMapper jsonpMapper) {
|
JsonpMapper jsonpMapper) {
|
||||||
|
|
||||||
@ -172,8 +171,7 @@ class SearchDocumentResponseBuilder {
|
|||||||
|
|
||||||
SearchShardStatistics shardStatistics = shards != null ? shardsFrom(shards) : null;
|
SearchShardStatistics shardStatistics = shards != null ? shardsFrom(shards) : null;
|
||||||
|
|
||||||
return new SearchDocumentResponse(totalHits, totalHitsRelation, maxScore, executionDuration, scrollId,
|
return new SearchDocumentResponse(totalHits, totalHitsRelation, maxScore, executionDuration, scrollId, pointInTimeId, searchDocuments,
|
||||||
pointInTimeId, searchDocuments,
|
|
||||||
aggregationsContainer, suggest, shardStatistics);
|
aggregationsContainer, suggest, shardStatistics);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -38,7 +38,6 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.domain.Sort;
|
import org.springframework.data.domain.Sort;
|
||||||
import org.springframework.data.elasticsearch.core.RefreshPolicy;
|
import org.springframework.data.elasticsearch.core.RefreshPolicy;
|
||||||
import org.springframework.data.elasticsearch.core.document.Document;
|
import org.springframework.data.elasticsearch.core.document.Document;
|
||||||
@ -53,6 +52,7 @@ import org.springframework.data.elasticsearch.core.query.UpdateResponse;
|
|||||||
import org.springframework.data.elasticsearch.core.query.types.ConflictsType;
|
import org.springframework.data.elasticsearch.core.query.types.ConflictsType;
|
||||||
import org.springframework.data.elasticsearch.core.query.types.OperatorType;
|
import org.springframework.data.elasticsearch.core.query.types.OperatorType;
|
||||||
import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
|
import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -220,7 +220,7 @@ final class TypeUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
static SortOrder sortOrder(Sort.@Nullable Direction direction) {
|
static SortOrder sortOrder(@Nullable Sort.Direction direction) {
|
||||||
|
|
||||||
if (direction == null) {
|
if (direction == null) {
|
||||||
return null;
|
return null;
|
||||||
@ -301,7 +301,7 @@ final class TypeUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
static OpType opType(IndexQuery.@Nullable OpType opType) {
|
static OpType opType(@Nullable IndexQuery.OpType opType) {
|
||||||
|
|
||||||
if (opType != null) {
|
if (opType != null) {
|
||||||
return switch (opType) {
|
return switch (opType) {
|
||||||
@ -325,7 +325,8 @@ final class TypeUtils {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
static UpdateResponse.@Nullable Result result(@Nullable Result result) {
|
@Nullable
|
||||||
|
static UpdateResponse.Result result(@Nullable Result result) {
|
||||||
|
|
||||||
if (result == null) {
|
if (result == null) {
|
||||||
return null;
|
return null;
|
||||||
@ -342,7 +343,7 @@ final class TypeUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
static ScoreMode scoreMode(RescorerQuery.@Nullable ScoreMode scoreMode) {
|
static ScoreMode scoreMode(@Nullable RescorerQuery.ScoreMode scoreMode) {
|
||||||
|
|
||||||
if (scoreMode == null) {
|
if (scoreMode == null) {
|
||||||
return null;
|
return null;
|
||||||
@ -360,7 +361,7 @@ final class TypeUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
static SearchType searchType(Query.@Nullable SearchType searchType) {
|
static SearchType searchType(@Nullable Query.SearchType searchType) {
|
||||||
|
|
||||||
if (searchType == null) {
|
if (searchType == null) {
|
||||||
return null;
|
return null;
|
||||||
@ -417,7 +418,7 @@ final class TypeUtils {
|
|||||||
|
|
||||||
@Nullable
|
@Nullable
|
||||||
static VersionType versionType(
|
static VersionType versionType(
|
||||||
org.springframework.data.elasticsearch.annotations.Document.@Nullable VersionType versionType) {
|
@Nullable org.springframework.data.elasticsearch.annotations.Document.VersionType versionType) {
|
||||||
|
|
||||||
if (versionType != null) {
|
if (versionType != null) {
|
||||||
return switch (versionType) {
|
return switch (versionType) {
|
||||||
@ -535,7 +536,7 @@ final class TypeUtils {
|
|||||||
* @param scoreMode spring-data-elasticsearch {@literal scoreMode}.
|
* @param scoreMode spring-data-elasticsearch {@literal scoreMode}.
|
||||||
* @return an Elasticsearch {@literal scoreMode}.
|
* @return an Elasticsearch {@literal scoreMode}.
|
||||||
*/
|
*/
|
||||||
static ChildScoreMode scoreMode(HasChildQuery.@Nullable ScoreMode scoreMode) {
|
static ChildScoreMode scoreMode(@Nullable HasChildQuery.ScoreMode scoreMode) {
|
||||||
if (scoreMode == null) {
|
if (scoreMode == null) {
|
||||||
return ChildScoreMode.None;
|
return ChildScoreMode.None;
|
||||||
}
|
}
|
||||||
|
@ -19,11 +19,11 @@ import co.elastic.clients.elasticsearch._types.mapping.RuntimeFieldType;
|
|||||||
import co.elastic.clients.elasticsearch._types.mapping.TypeMapping;
|
import co.elastic.clients.elasticsearch._types.mapping.TypeMapping;
|
||||||
import co.elastic.clients.elasticsearch.indices.IndexSettings;
|
import co.elastic.clients.elasticsearch.indices.IndexSettings;
|
||||||
import co.elastic.clients.elasticsearch.indices.PutMappingRequest;
|
import co.elastic.clients.elasticsearch.indices.PutMappingRequest;
|
||||||
|
import org.springframework.aot.hint.MemberCategory;
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.aot.hint.RuntimeHints;
|
import org.springframework.aot.hint.RuntimeHints;
|
||||||
import org.springframework.aot.hint.RuntimeHintsRegistrar;
|
import org.springframework.aot.hint.RuntimeHintsRegistrar;
|
||||||
import org.springframework.aot.hint.TypeReference;
|
import org.springframework.aot.hint.TypeReference;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* runtime hints for the Elasticsearch client libraries, as these do not provide any of their own.
|
* runtime hints for the Elasticsearch client libraries, as these do not provide any of their own.
|
||||||
|
@ -1,2 +1,3 @@
|
|||||||
@org.jspecify.annotations.NullMarked
|
@org.springframework.lang.NonNullApi
|
||||||
|
@org.springframework.lang.NonNullFields
|
||||||
package org.springframework.data.elasticsearch.client.elc.aot;
|
package org.springframework.data.elasticsearch.client.elc.aot;
|
||||||
|
@ -18,5 +18,6 @@
|
|||||||
* This package contains classes that use the new Elasticsearch client library (co.elastic.clients:elasticsearch-java)
|
* This package contains classes that use the new Elasticsearch client library (co.elastic.clients:elasticsearch-java)
|
||||||
* to access Elasticsearch.
|
* to access Elasticsearch.
|
||||||
*/
|
*/
|
||||||
@org.jspecify.annotations.NullMarked
|
@org.springframework.lang.NonNullApi
|
||||||
|
@org.springframework.lang.NonNullFields
|
||||||
package org.springframework.data.elasticsearch.client.elc;
|
package org.springframework.data.elasticsearch.client.elc;
|
||||||
|
@ -1,274 +0,0 @@
|
|||||||
package org.springframework.data.elasticsearch.client.elc.rest5_client;
|
|
||||||
|
|
||||||
import co.elastic.clients.transport.TransportOptions;
|
|
||||||
import co.elastic.clients.transport.TransportUtils;
|
|
||||||
import co.elastic.clients.transport.rest5_client.Rest5ClientOptions;
|
|
||||||
import co.elastic.clients.transport.rest5_client.low_level.RequestOptions;
|
|
||||||
import co.elastic.clients.transport.rest5_client.low_level.Rest5Client;
|
|
||||||
import co.elastic.clients.transport.rest5_client.low_level.Rest5ClientBuilder;
|
|
||||||
|
|
||||||
import java.net.InetSocketAddress;
|
|
||||||
import java.net.URI;
|
|
||||||
import java.net.URISyntaxException;
|
|
||||||
import java.security.NoSuchAlgorithmException;
|
|
||||||
import java.time.Duration;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.Locale;
|
|
||||||
import java.util.concurrent.ThreadFactory;
|
|
||||||
import java.util.concurrent.TimeUnit;
|
|
||||||
import java.util.concurrent.atomic.AtomicLong;
|
|
||||||
import java.util.function.Function;
|
|
||||||
|
|
||||||
import javax.net.ssl.SSLContext;
|
|
||||||
|
|
||||||
import org.apache.hc.client5.http.config.ConnectionConfig;
|
|
||||||
import org.apache.hc.client5.http.config.RequestConfig;
|
|
||||||
import org.apache.hc.client5.http.impl.DefaultAuthenticationStrategy;
|
|
||||||
import org.apache.hc.client5.http.impl.async.CloseableHttpAsyncClient;
|
|
||||||
import org.apache.hc.client5.http.impl.async.HttpAsyncClientBuilder;
|
|
||||||
import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManager;
|
|
||||||
import org.apache.hc.client5.http.impl.nio.PoolingAsyncClientConnectionManagerBuilder;
|
|
||||||
import org.apache.hc.client5.http.impl.routing.DefaultProxyRoutePlanner;
|
|
||||||
import org.apache.hc.core5.http.Header;
|
|
||||||
import org.apache.hc.core5.http.HttpHost;
|
|
||||||
import org.apache.hc.core5.http.message.BasicHeader;
|
|
||||||
import org.apache.hc.core5.http.nio.ssl.BasicClientTlsStrategy;
|
|
||||||
import org.apache.hc.core5.util.Timeout;
|
|
||||||
import org.jspecify.annotations.NonNull;
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.client.ClientConfiguration;
|
|
||||||
import org.springframework.data.elasticsearch.support.HttpHeaders;
|
|
||||||
import org.springframework.data.elasticsearch.support.VersionInfo;
|
|
||||||
import org.springframework.util.Assert;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Utility class containing the functions to create the Elasticsearch Rest5Client used from Elasticsearch 9 on.
|
|
||||||
*
|
|
||||||
* @since 6.0
|
|
||||||
*/
|
|
||||||
public final class Rest5Clients {
|
|
||||||
|
|
||||||
// values copied from Rest5ClientBuilder
|
|
||||||
public static final int DEFAULT_CONNECT_TIMEOUT_MILLIS = 1000;
|
|
||||||
public static final int DEFAULT_SOCKET_TIMEOUT_MILLIS = 30000;
|
|
||||||
public static final int DEFAULT_RESPONSE_TIMEOUT_MILLIS = 0; // meaning infinite
|
|
||||||
public static final int DEFAULT_MAX_CONN_PER_ROUTE = 10;
|
|
||||||
public static final int DEFAULT_MAX_CONN_TOTAL = 30;
|
|
||||||
|
|
||||||
private Rest5Clients() {}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a low level {@link Rest5Client} for the given configuration.
|
|
||||||
*
|
|
||||||
* @param clientConfiguration must not be {@literal null}
|
|
||||||
* @return the {@link Rest5Client}
|
|
||||||
*/
|
|
||||||
public static Rest5Client getRest5Client(ClientConfiguration clientConfiguration) {
|
|
||||||
return getRest5ClientBuilder(clientConfiguration).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Rest5ClientBuilder getRest5ClientBuilder(ClientConfiguration clientConfiguration) {
|
|
||||||
|
|
||||||
HttpHost[] httpHosts = getHttpHosts(clientConfiguration);
|
|
||||||
Rest5ClientBuilder builder = Rest5Client.builder(httpHosts);
|
|
||||||
|
|
||||||
if (clientConfiguration.getPathPrefix() != null) {
|
|
||||||
builder.setPathPrefix(clientConfiguration.getPathPrefix());
|
|
||||||
}
|
|
||||||
|
|
||||||
HttpHeaders headers = clientConfiguration.getDefaultHeaders();
|
|
||||||
|
|
||||||
if (!headers.isEmpty()) {
|
|
||||||
builder.setDefaultHeaders(toHeaderArray(headers));
|
|
||||||
}
|
|
||||||
|
|
||||||
// we need to provide our own HttpClient, as the Rest5ClientBuilder
|
|
||||||
// does not provide a callback for configuration the http client as the old RestClientBuilder.
|
|
||||||
var httpClient = createHttpClient(clientConfiguration);
|
|
||||||
builder.setHttpClient(httpClient);
|
|
||||||
|
|
||||||
for (ClientConfiguration.ClientConfigurationCallback<?> clientConfigurationCallback : clientConfiguration
|
|
||||||
.getClientConfigurers()) {
|
|
||||||
if (clientConfigurationCallback instanceof ElasticsearchRest5ClientConfigurationCallback configurationCallback) {
|
|
||||||
builder = configurationCallback.configure(builder);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return builder;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static HttpHost @NonNull [] getHttpHosts(ClientConfiguration clientConfiguration) {
|
|
||||||
List<InetSocketAddress> hosts = clientConfiguration.getEndpoints();
|
|
||||||
boolean useSsl = clientConfiguration.useSsl();
|
|
||||||
return hosts.stream()
|
|
||||||
.map(it -> (useSsl ? "https" : "http") + "://" + it.getHostString() + ':' + it.getPort())
|
|
||||||
.map(URI::create)
|
|
||||||
.map(HttpHost::create)
|
|
||||||
.toArray(HttpHost[]::new);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static Header[] toHeaderArray(HttpHeaders headers) {
|
|
||||||
return headers.entrySet().stream() //
|
|
||||||
.flatMap(entry -> entry.getValue().stream() //
|
|
||||||
.map(value -> new BasicHeader(entry.getKey(), value))) //
|
|
||||||
.toList().toArray(new Header[0]);
|
|
||||||
}
|
|
||||||
|
|
||||||
// the basic logic to create the http client is copied from the Rest5ClientBuilder class, this is taken from the
|
|
||||||
// Elasticsearch code, as there is no public usable instance in that
|
|
||||||
private static CloseableHttpAsyncClient createHttpClient(ClientConfiguration clientConfiguration) {
|
|
||||||
|
|
||||||
var requestConfigBuilder = RequestConfig.custom();
|
|
||||||
var connectionConfigBuilder = ConnectionConfig.custom();
|
|
||||||
|
|
||||||
Duration connectTimeout = clientConfiguration.getConnectTimeout();
|
|
||||||
|
|
||||||
if (!connectTimeout.isNegative()) {
|
|
||||||
connectionConfigBuilder.setConnectTimeout(
|
|
||||||
Timeout.of(Math.toIntExact(connectTimeout.toMillis()), TimeUnit.MILLISECONDS));
|
|
||||||
}
|
|
||||||
|
|
||||||
Duration socketTimeout = clientConfiguration.getSocketTimeout();
|
|
||||||
|
|
||||||
if (!socketTimeout.isNegative()) {
|
|
||||||
var soTimeout = Timeout.of(Math.toIntExact(socketTimeout.toMillis()), TimeUnit.MILLISECONDS);
|
|
||||||
connectionConfigBuilder.setSocketTimeout(soTimeout);
|
|
||||||
requestConfigBuilder.setConnectionRequestTimeout(soTimeout);
|
|
||||||
} else {
|
|
||||||
connectionConfigBuilder.setSocketTimeout(Timeout.of(DEFAULT_SOCKET_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS));
|
|
||||||
requestConfigBuilder
|
|
||||||
.setConnectionRequestTimeout(Timeout.of(DEFAULT_RESPONSE_TIMEOUT_MILLIS, TimeUnit.MILLISECONDS));
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
SSLContext sslContext = clientConfiguration.getCaFingerprint().isPresent()
|
|
||||||
? TransportUtils.sslContextFromCaFingerprint(clientConfiguration.getCaFingerprint().get())
|
|
||||||
: (clientConfiguration.getSslContext().isPresent()
|
|
||||||
? clientConfiguration.getSslContext().get()
|
|
||||||
: SSLContext.getDefault());
|
|
||||||
|
|
||||||
ConnectionConfig connectionConfig = connectionConfigBuilder.build();
|
|
||||||
|
|
||||||
PoolingAsyncClientConnectionManager defaultConnectionManager = PoolingAsyncClientConnectionManagerBuilder.create()
|
|
||||||
.setDefaultConnectionConfig(connectionConfig)
|
|
||||||
.setMaxConnPerRoute(DEFAULT_MAX_CONN_PER_ROUTE)
|
|
||||||
.setMaxConnTotal(DEFAULT_MAX_CONN_TOTAL)
|
|
||||||
.setTlsStrategy(new BasicClientTlsStrategy(sslContext))
|
|
||||||
.build();
|
|
||||||
|
|
||||||
var requestConfig = requestConfigBuilder.build();
|
|
||||||
|
|
||||||
var immutableRefToHttpClientBuilder = new Object() {
|
|
||||||
HttpAsyncClientBuilder httpClientBuilder = HttpAsyncClientBuilder.create()
|
|
||||||
.setDefaultRequestConfig(requestConfig)
|
|
||||||
.setConnectionManager(defaultConnectionManager)
|
|
||||||
.setUserAgent(VersionInfo.clientVersions())
|
|
||||||
.setTargetAuthenticationStrategy(new DefaultAuthenticationStrategy())
|
|
||||||
.setThreadFactory(new RestClientThreadFactory());
|
|
||||||
};
|
|
||||||
|
|
||||||
clientConfiguration.getProxy().ifPresent(proxy -> {
|
|
||||||
try {
|
|
||||||
var proxyRoutePlanner = new DefaultProxyRoutePlanner(HttpHost.create(proxy));
|
|
||||||
immutableRefToHttpClientBuilder.httpClientBuilder.setRoutePlanner(proxyRoutePlanner);
|
|
||||||
} catch (URISyntaxException e) {
|
|
||||||
throw new RuntimeException(e);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
immutableRefToHttpClientBuilder.httpClientBuilder.addRequestInterceptorFirst((request, entity, context) -> {
|
|
||||||
clientConfiguration.getHeadersSupplier().get().forEach((header, values) -> {
|
|
||||||
// The accept and content-type headers are already put on the request, despite this being the first
|
|
||||||
// interceptor.
|
|
||||||
if ("Accept".equalsIgnoreCase(header) || " Content-Type".equalsIgnoreCase(header)) {
|
|
||||||
request.removeHeaders(header);
|
|
||||||
}
|
|
||||||
values.forEach(value -> request.addHeader(header, value));
|
|
||||||
});
|
|
||||||
});
|
|
||||||
|
|
||||||
for (ClientConfiguration.ClientConfigurationCallback<?> clientConfigurer : clientConfiguration
|
|
||||||
.getClientConfigurers()) {
|
|
||||||
if (clientConfigurer instanceof ElasticsearchHttpClientConfigurationCallback httpClientConfigurer) {
|
|
||||||
immutableRefToHttpClientBuilder.httpClientBuilder = httpClientConfigurer.configure(immutableRefToHttpClientBuilder.httpClientBuilder);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return immutableRefToHttpClientBuilder.httpClientBuilder.build();
|
|
||||||
} catch (NoSuchAlgorithmException e) {
|
|
||||||
throw new IllegalStateException("could not create the default ssl context", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Copied from the Elasticsearch code as this class is not public there.
|
|
||||||
*/
|
|
||||||
private static class RestClientThreadFactory implements ThreadFactory {
|
|
||||||
private static final AtomicLong CLIENT_THREAD_POOL_ID_GENERATOR = new AtomicLong();
|
|
||||||
private final long clientThreadPoolId;
|
|
||||||
private final AtomicLong clientThreadId;
|
|
||||||
|
|
||||||
private RestClientThreadFactory() {
|
|
||||||
this.clientThreadPoolId = CLIENT_THREAD_POOL_ID_GENERATOR.getAndIncrement();
|
|
||||||
this.clientThreadId = new AtomicLong();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Thread newThread(Runnable runnable) {
|
|
||||||
return new Thread(runnable, String.format(Locale.ROOT, "elasticsearch-rest-client-%d-thread-%d",
|
|
||||||
this.clientThreadPoolId, this.clientThreadId.incrementAndGet()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* {@link org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationCallback} to configure
|
|
||||||
* the Elasticsearch Rest5Client's Http client with a {@link HttpAsyncClientBuilder}
|
|
||||||
*
|
|
||||||
* @since 6.0
|
|
||||||
*/
|
|
||||||
public interface ElasticsearchHttpClientConfigurationCallback
|
|
||||||
extends ClientConfiguration.ClientConfigurationCallback<HttpAsyncClientBuilder> {
|
|
||||||
|
|
||||||
static Rest5Clients.ElasticsearchHttpClientConfigurationCallback from(
|
|
||||||
Function<HttpAsyncClientBuilder, HttpAsyncClientBuilder> httpClientBuilderCallback) {
|
|
||||||
|
|
||||||
Assert.notNull(httpClientBuilderCallback, "httpClientBuilderCallback must not be null");
|
|
||||||
|
|
||||||
return httpClientBuilderCallback::apply;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* {@link ClientConfiguration.ClientConfigurationCallback} to configure the Rest5Client client with a
|
|
||||||
* {@link Rest5ClientBuilder}
|
|
||||||
*
|
|
||||||
* @since 6.0
|
|
||||||
*/
|
|
||||||
public interface ElasticsearchRest5ClientConfigurationCallback
|
|
||||||
extends ClientConfiguration.ClientConfigurationCallback<Rest5ClientBuilder> {
|
|
||||||
|
|
||||||
static ElasticsearchRest5ClientConfigurationCallback from(
|
|
||||||
Function<Rest5ClientBuilder, Rest5ClientBuilder> rest5ClientBuilderCallback) {
|
|
||||||
|
|
||||||
Assert.notNull(rest5ClientBuilderCallback, "rest5ClientBuilderCallback must not be null");
|
|
||||||
|
|
||||||
return rest5ClientBuilderCallback::apply;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static Rest5ClientOptions.Builder getRest5ClientOptionsBuilder(@Nullable TransportOptions transportOptions) {
|
|
||||||
|
|
||||||
if (transportOptions instanceof Rest5ClientOptions rest5ClientOptions) {
|
|
||||||
return rest5ClientOptions.toBuilder();
|
|
||||||
}
|
|
||||||
|
|
||||||
var builder = new Rest5ClientOptions.Builder(RequestOptions.DEFAULT.toBuilder());
|
|
||||||
|
|
||||||
if (transportOptions != null) {
|
|
||||||
transportOptions.headers().forEach(header -> builder.addHeader(header.getKey(), header.getValue()));
|
|
||||||
transportOptions.queryParameters().forEach(builder::setParameter);
|
|
||||||
builder.onWarnings(transportOptions.onWarnings());
|
|
||||||
}
|
|
||||||
|
|
||||||
return builder;
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,21 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 the original author 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.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/**
|
|
||||||
* This package contains related to the new (from Elasticsearch 9 on) Rest5Client. There are also classes copied over from Elasticsearch in order to have a Rest5ClientBuilder that allows to configure the http client.
|
|
||||||
*/
|
|
||||||
@org.jspecify.annotations.NullMarked
|
|
||||||
package org.springframework.data.elasticsearch.client.elc.rest5_client;
|
|
@ -1,195 +0,0 @@
|
|||||||
package org.springframework.data.elasticsearch.client.elc.rest_client;
|
|
||||||
|
|
||||||
import co.elastic.clients.transport.TransportOptions;
|
|
||||||
import co.elastic.clients.transport.TransportUtils;
|
|
||||||
import co.elastic.clients.transport.rest_client.RestClientOptions;
|
|
||||||
|
|
||||||
import java.net.InetSocketAddress;
|
|
||||||
import java.time.Duration;
|
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.List;
|
|
||||||
import java.util.function.Function;
|
|
||||||
import java.util.function.Supplier;
|
|
||||||
|
|
||||||
import org.apache.http.HttpHost;
|
|
||||||
import org.apache.http.HttpRequest;
|
|
||||||
import org.apache.http.HttpRequestInterceptor;
|
|
||||||
import org.apache.http.client.config.RequestConfig;
|
|
||||||
import org.apache.http.impl.nio.client.HttpAsyncClientBuilder;
|
|
||||||
import org.apache.http.message.BasicHeader;
|
|
||||||
import org.apache.http.protocol.HttpContext;
|
|
||||||
import org.elasticsearch.client.RequestOptions;
|
|
||||||
import org.elasticsearch.client.RestClient;
|
|
||||||
import org.elasticsearch.client.RestClientBuilder;
|
|
||||||
import org.jspecify.annotations.NonNull;
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.client.ClientConfiguration;
|
|
||||||
import org.springframework.data.elasticsearch.client.elc.ElasticsearchClients;
|
|
||||||
import org.springframework.data.elasticsearch.support.HttpHeaders;
|
|
||||||
import org.springframework.util.Assert;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Utility class containing the functions to create the Elasticsearch RestClient used up to Elasticsearch 9.
|
|
||||||
*
|
|
||||||
* @since 6.0
|
|
||||||
* @deprecated since 6.0, use the new Rest5Client the code for that is in the package ../rest_client.
|
|
||||||
*/
|
|
||||||
@Deprecated(since = "6.0", forRemoval = true)
|
|
||||||
public final class RestClients {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Creates a low level {@link RestClient} for the given configuration.
|
|
||||||
*
|
|
||||||
* @param clientConfiguration must not be {@literal null}
|
|
||||||
* @return the {@link RestClient}
|
|
||||||
*/
|
|
||||||
public static RestClient getRestClient(ClientConfiguration clientConfiguration) {
|
|
||||||
return getRestClientBuilder(clientConfiguration).build();
|
|
||||||
}
|
|
||||||
|
|
||||||
private static RestClientBuilder getRestClientBuilder(ClientConfiguration clientConfiguration) {
|
|
||||||
HttpHost[] httpHosts = getHttpHosts(clientConfiguration);
|
|
||||||
RestClientBuilder builder = RestClient.builder(httpHosts);
|
|
||||||
|
|
||||||
if (clientConfiguration.getPathPrefix() != null) {
|
|
||||||
builder.setPathPrefix(clientConfiguration.getPathPrefix());
|
|
||||||
}
|
|
||||||
|
|
||||||
HttpHeaders headers = clientConfiguration.getDefaultHeaders();
|
|
||||||
|
|
||||||
if (!headers.isEmpty()) {
|
|
||||||
builder.setDefaultHeaders(toHeaderArray(headers));
|
|
||||||
}
|
|
||||||
|
|
||||||
builder.setHttpClientConfigCallback(clientBuilder -> {
|
|
||||||
if (clientConfiguration.getCaFingerprint().isPresent()) {
|
|
||||||
clientBuilder
|
|
||||||
.setSSLContext(TransportUtils.sslContextFromCaFingerprint(clientConfiguration.getCaFingerprint().get()));
|
|
||||||
}
|
|
||||||
clientConfiguration.getSslContext().ifPresent(clientBuilder::setSSLContext);
|
|
||||||
clientConfiguration.getHostNameVerifier().ifPresent(clientBuilder::setSSLHostnameVerifier);
|
|
||||||
clientBuilder.addInterceptorLast(new CustomHeaderInjector(clientConfiguration.getHeadersSupplier()));
|
|
||||||
|
|
||||||
RequestConfig.Builder requestConfigBuilder = RequestConfig.custom();
|
|
||||||
Duration connectTimeout = clientConfiguration.getConnectTimeout();
|
|
||||||
|
|
||||||
if (!connectTimeout.isNegative()) {
|
|
||||||
requestConfigBuilder.setConnectTimeout(Math.toIntExact(connectTimeout.toMillis()));
|
|
||||||
}
|
|
||||||
|
|
||||||
Duration socketTimeout = clientConfiguration.getSocketTimeout();
|
|
||||||
|
|
||||||
if (!socketTimeout.isNegative()) {
|
|
||||||
requestConfigBuilder.setSocketTimeout(Math.toIntExact(socketTimeout.toMillis()));
|
|
||||||
requestConfigBuilder.setConnectionRequestTimeout(Math.toIntExact(socketTimeout.toMillis()));
|
|
||||||
}
|
|
||||||
|
|
||||||
clientBuilder.setDefaultRequestConfig(requestConfigBuilder.build());
|
|
||||||
|
|
||||||
clientConfiguration.getProxy().map(HttpHost::create).ifPresent(clientBuilder::setProxy);
|
|
||||||
|
|
||||||
for (ClientConfiguration.ClientConfigurationCallback<?> clientConfigurer : clientConfiguration
|
|
||||||
.getClientConfigurers()) {
|
|
||||||
if (clientConfigurer instanceof RestClients.ElasticsearchHttpClientConfigurationCallback restClientConfigurationCallback) {
|
|
||||||
clientBuilder = restClientConfigurationCallback.configure(clientBuilder);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return clientBuilder;
|
|
||||||
});
|
|
||||||
|
|
||||||
for (ClientConfiguration.ClientConfigurationCallback<?> clientConfigurationCallback : clientConfiguration
|
|
||||||
.getClientConfigurers()) {
|
|
||||||
if (clientConfigurationCallback instanceof ElasticsearchRestClientConfigurationCallback configurationCallback) {
|
|
||||||
builder = configurationCallback.configure(builder);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return builder;
|
|
||||||
}
|
|
||||||
|
|
||||||
private static HttpHost @NonNull [] getHttpHosts(ClientConfiguration clientConfiguration) {
|
|
||||||
List<InetSocketAddress> hosts = clientConfiguration.getEndpoints();
|
|
||||||
boolean useSsl = clientConfiguration.useSsl();
|
|
||||||
return hosts.stream()
|
|
||||||
.map(it -> (useSsl ? "https" : "http") + "://" + it.getHostString() + ':' + it.getPort())
|
|
||||||
.map(HttpHost::create).toArray(HttpHost[]::new);
|
|
||||||
}
|
|
||||||
|
|
||||||
private static org.apache.http.Header[] toHeaderArray(HttpHeaders headers) {
|
|
||||||
return headers.entrySet().stream() //
|
|
||||||
.flatMap(entry -> entry.getValue().stream() //
|
|
||||||
.map(value -> new BasicHeader(entry.getKey(), value))) //
|
|
||||||
.toArray(org.apache.http.Header[]::new);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Interceptor to inject custom supplied headers.
|
|
||||||
*
|
|
||||||
* @since 4.4
|
|
||||||
*/
|
|
||||||
record CustomHeaderInjector(Supplier<HttpHeaders> headersSupplier) implements HttpRequestInterceptor {
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void process(HttpRequest request, HttpContext context) {
|
|
||||||
HttpHeaders httpHeaders = headersSupplier.get();
|
|
||||||
|
|
||||||
if (httpHeaders != null && !httpHeaders.isEmpty()) {
|
|
||||||
Arrays.stream(toHeaderArray(httpHeaders)).forEach(request::addHeader);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* {@link org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationCallback} to configure
|
|
||||||
* the Elasticsearch RestClient's Http client with a {@link HttpAsyncClientBuilder}
|
|
||||||
*
|
|
||||||
* @since 4.4
|
|
||||||
*/
|
|
||||||
public interface ElasticsearchHttpClientConfigurationCallback
|
|
||||||
extends ClientConfiguration.ClientConfigurationCallback<HttpAsyncClientBuilder> {
|
|
||||||
|
|
||||||
static RestClients.ElasticsearchHttpClientConfigurationCallback from(
|
|
||||||
Function<HttpAsyncClientBuilder, HttpAsyncClientBuilder> httpClientBuilderCallback) {
|
|
||||||
|
|
||||||
Assert.notNull(httpClientBuilderCallback, "httpClientBuilderCallback must not be null");
|
|
||||||
|
|
||||||
return httpClientBuilderCallback::apply;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* {@link org.springframework.data.elasticsearch.client.ClientConfiguration.ClientConfigurationCallback} to configure
|
|
||||||
* the RestClient client with a {@link RestClientBuilder}
|
|
||||||
*
|
|
||||||
* @since 5.0
|
|
||||||
*/
|
|
||||||
public interface ElasticsearchRestClientConfigurationCallback
|
|
||||||
extends ClientConfiguration.ClientConfigurationCallback<RestClientBuilder> {
|
|
||||||
|
|
||||||
static ElasticsearchRestClientConfigurationCallback from(
|
|
||||||
Function<RestClientBuilder, RestClientBuilder> restClientBuilderCallback) {
|
|
||||||
|
|
||||||
Assert.notNull(restClientBuilderCallback, "restClientBuilderCallback must not be null");
|
|
||||||
|
|
||||||
return restClientBuilderCallback::apply;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static RestClientOptions.Builder getRestClientOptionsBuilder(@Nullable TransportOptions transportOptions) {
|
|
||||||
|
|
||||||
if (transportOptions instanceof RestClientOptions restClientOptions) {
|
|
||||||
return restClientOptions.toBuilder();
|
|
||||||
}
|
|
||||||
|
|
||||||
var builder = new RestClientOptions.Builder(RequestOptions.DEFAULT.toBuilder());
|
|
||||||
|
|
||||||
if (transportOptions != null) {
|
|
||||||
transportOptions.headers().forEach(header -> builder.addHeader(header.getKey(), header.getValue()));
|
|
||||||
transportOptions.queryParameters().forEach(builder::setParameter);
|
|
||||||
builder.onWarnings(transportOptions.onWarnings());
|
|
||||||
}
|
|
||||||
|
|
||||||
return builder;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@ -1,2 +1,3 @@
|
|||||||
@org.jspecify.annotations.NullMarked
|
@org.springframework.lang.NonNullApi
|
||||||
|
@org.springframework.lang.NonNullFields
|
||||||
package org.springframework.data.elasticsearch.client;
|
package org.springframework.data.elasticsearch.client;
|
||||||
|
@ -19,7 +19,7 @@ import java.util.LinkedHashSet;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,2 +1,3 @@
|
|||||||
@org.jspecify.annotations.NullMarked
|
@org.springframework.lang.NonNullApi
|
||||||
|
@org.springframework.lang.NonNullFields
|
||||||
package org.springframework.data.elasticsearch.client.util;
|
package org.springframework.data.elasticsearch.client.util;
|
||||||
|
@ -17,7 +17,6 @@ package org.springframework.data.elasticsearch.config;
|
|||||||
|
|
||||||
import static org.springframework.data.config.ParsingUtils.*;
|
import static org.springframework.data.config.ParsingUtils.*;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.beans.factory.support.AbstractBeanDefinition;
|
import org.springframework.beans.factory.support.AbstractBeanDefinition;
|
||||||
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
|
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
|
||||||
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
|
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
|
||||||
@ -29,6 +28,7 @@ import org.springframework.data.auditing.config.IsNewAwareAuditingHandlerBeanDef
|
|||||||
import org.springframework.data.elasticsearch.core.event.AuditingEntityCallback;
|
import org.springframework.data.elasticsearch.core.event.AuditingEntityCallback;
|
||||||
import org.springframework.data.elasticsearch.core.event.ReactiveAuditingEntityCallback;
|
import org.springframework.data.elasticsearch.core.event.ReactiveAuditingEntityCallback;
|
||||||
import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
|
import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.ClassUtils;
|
import org.springframework.util.ClassUtils;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
import org.w3c.dom.Element;
|
import org.w3c.dom.Element;
|
||||||
|
@ -20,7 +20,6 @@ import java.util.Collections;
|
|||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.beans.factory.config.BeanDefinition;
|
import org.springframework.beans.factory.config.BeanDefinition;
|
||||||
import org.springframework.context.annotation.Bean;
|
import org.springframework.context.annotation.Bean;
|
||||||
import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
|
import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
|
||||||
@ -35,6 +34,7 @@ import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchC
|
|||||||
import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
|
import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
|
||||||
import org.springframework.data.mapping.model.FieldNamingStrategy;
|
import org.springframework.data.mapping.model.FieldNamingStrategy;
|
||||||
import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
|
import org.springframework.data.mapping.model.PropertyNameFieldNamingStrategy;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.ClassUtils;
|
import org.springframework.util.ClassUtils;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
|
@ -1,2 +1,3 @@
|
|||||||
@org.jspecify.annotations.NullMarked
|
@org.springframework.lang.NonNullApi
|
||||||
|
@org.springframework.lang.NonNullFields
|
||||||
package org.springframework.data.elasticsearch.config;
|
package org.springframework.data.elasticsearch.config;
|
||||||
|
@ -24,7 +24,6 @@ import java.util.Objects;
|
|||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.beans.BeansException;
|
import org.springframework.beans.BeansException;
|
||||||
import org.springframework.context.ApplicationContext;
|
import org.springframework.context.ApplicationContext;
|
||||||
import org.springframework.context.ApplicationContextAware;
|
import org.springframework.context.ApplicationContextAware;
|
||||||
@ -58,6 +57,7 @@ import org.springframework.data.elasticsearch.support.VersionInfo;
|
|||||||
import org.springframework.data.mapping.callback.EntityCallbacks;
|
import org.springframework.data.mapping.callback.EntityCallbacks;
|
||||||
import org.springframework.data.mapping.context.MappingContext;
|
import org.springframework.data.mapping.context.MappingContext;
|
||||||
import org.springframework.data.util.Streamable;
|
import org.springframework.data.util.Streamable;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
|
|
||||||
@ -298,6 +298,12 @@ public abstract class AbstractElasticsearchTemplate implements ElasticsearchOper
|
|||||||
return this.delete(id, getIndexCoordinatesFor(entityType));
|
return this.delete(id, getIndexCoordinatesFor(entityType));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Deprecated
|
||||||
|
public ByQueryResponse delete(Query query, Class<?> clazz) {
|
||||||
|
return delete(query, clazz, getIndexCoordinatesFor(clazz));
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String delete(Object entity) {
|
public String delete(Object entity) {
|
||||||
return delete(entity, getIndexCoordinatesFor(entity.getClass()));
|
return delete(entity, getIndexCoordinatesFor(entity.getClass()));
|
||||||
|
@ -26,7 +26,6 @@ import java.util.List;
|
|||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.reactivestreams.Subscriber;
|
import org.reactivestreams.Subscriber;
|
||||||
import org.reactivestreams.Subscription;
|
import org.reactivestreams.Subscription;
|
||||||
import org.springframework.beans.BeansException;
|
import org.springframework.beans.BeansException;
|
||||||
@ -57,6 +56,7 @@ import org.springframework.data.elasticsearch.core.script.Script;
|
|||||||
import org.springframework.data.elasticsearch.core.suggest.response.Suggest;
|
import org.springframework.data.elasticsearch.core.suggest.response.Suggest;
|
||||||
import org.springframework.data.elasticsearch.support.VersionInfo;
|
import org.springframework.data.elasticsearch.support.VersionInfo;
|
||||||
import org.springframework.data.mapping.callback.ReactiveEntityCallbacks;
|
import org.springframework.data.mapping.callback.ReactiveEntityCallbacks;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -233,7 +233,6 @@ abstract public class AbstractReactiveElasticsearchTemplate
|
|||||||
.subscribe(new Subscriber<>() {
|
.subscribe(new Subscriber<>() {
|
||||||
@Nullable private Subscription subscription = null;
|
@Nullable private Subscription subscription = null;
|
||||||
private final AtomicBoolean upstreamComplete = new AtomicBoolean(false);
|
private final AtomicBoolean upstreamComplete = new AtomicBoolean(false);
|
||||||
private final AtomicBoolean onNextHasBeenCalled = new AtomicBoolean(false);
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onSubscribe(Subscription subscription) {
|
public void onSubscribe(Subscription subscription) {
|
||||||
@ -243,7 +242,6 @@ abstract public class AbstractReactiveElasticsearchTemplate
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onNext(List<T> entityList) {
|
public void onNext(List<T> entityList) {
|
||||||
onNextHasBeenCalled.set(true);
|
|
||||||
saveAll(entityList, index)
|
saveAll(entityList, index)
|
||||||
.map(sink::tryEmitNext)
|
.map(sink::tryEmitNext)
|
||||||
.doOnComplete(() -> {
|
.doOnComplete(() -> {
|
||||||
@ -269,10 +267,6 @@ abstract public class AbstractReactiveElasticsearchTemplate
|
|||||||
@Override
|
@Override
|
||||||
public void onComplete() {
|
public void onComplete() {
|
||||||
upstreamComplete.set(true);
|
upstreamComplete.set(true);
|
||||||
if (!onNextHasBeenCalled.get()) {
|
|
||||||
// this happens when an empty flux is saved
|
|
||||||
sink.tryEmitComplete();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
return sink.asFlux();
|
return sink.asFlux();
|
||||||
@ -414,6 +408,12 @@ abstract public class AbstractReactiveElasticsearchTemplate
|
|||||||
|
|
||||||
abstract protected Mono<String> doDeleteById(String id, @Nullable String routing, IndexCoordinates index);
|
abstract protected Mono<String> doDeleteById(String id, @Nullable String routing, IndexCoordinates index);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
@Deprecated
|
||||||
|
public Mono<ByQueryResponse> delete(Query query, Class<?> entityType) {
|
||||||
|
return delete(query, entityType, getIndexCoordinatesFor(entityType));
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Mono<ByQueryResponse> delete(DeleteQuery query, Class<?> entityType) {
|
public Mono<ByQueryResponse> delete(DeleteQuery query, Class<?> entityType) {
|
||||||
return delete(query, entityType, getIndexCoordinatesFor(entityType));
|
return delete(query, entityType, getIndexCoordinatesFor(entityType));
|
||||||
|
@ -18,7 +18,6 @@ package org.springframework.data.elasticsearch.core;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
|
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
|
||||||
import org.springframework.data.elasticsearch.core.query.BulkOptions;
|
import org.springframework.data.elasticsearch.core.query.BulkOptions;
|
||||||
import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
|
import org.springframework.data.elasticsearch.core.query.ByQueryResponse;
|
||||||
@ -29,6 +28,7 @@ import org.springframework.data.elasticsearch.core.query.UpdateQuery;
|
|||||||
import org.springframework.data.elasticsearch.core.query.UpdateResponse;
|
import org.springframework.data.elasticsearch.core.query.UpdateResponse;
|
||||||
import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
|
import org.springframework.data.elasticsearch.core.reindex.ReindexRequest;
|
||||||
import org.springframework.data.elasticsearch.core.reindex.ReindexResponse;
|
import org.springframework.data.elasticsearch.core.reindex.ReindexResponse;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The operations for the
|
* The operations for the
|
||||||
@ -272,6 +272,19 @@ public interface DocumentOperations {
|
|||||||
*/
|
*/
|
||||||
String delete(Object entity, IndexCoordinates index);
|
String delete(Object entity, IndexCoordinates index);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete all records matching the query.
|
||||||
|
*
|
||||||
|
* @param query query defining the objects
|
||||||
|
* @param clazz The entity class, must be annotated with
|
||||||
|
* {@link org.springframework.data.elasticsearch.annotations.Document}
|
||||||
|
* @return response with detailed information
|
||||||
|
* @since 4.1
|
||||||
|
* @deprecated since 5.3.0, use {@link #delete(DeleteQuery, Class)}
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
ByQueryResponse delete(Query query, Class<?> clazz);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete all records matching the query.
|
* Delete all records matching the query.
|
||||||
*
|
*
|
||||||
@ -283,6 +296,19 @@ public interface DocumentOperations {
|
|||||||
*/
|
*/
|
||||||
ByQueryResponse delete(DeleteQuery query, Class<?> clazz);
|
ByQueryResponse delete(DeleteQuery query, Class<?> clazz);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete all records matching the query.
|
||||||
|
*
|
||||||
|
* @param query query defining the objects
|
||||||
|
* @param clazz The entity class, must be annotated with
|
||||||
|
* {@link org.springframework.data.elasticsearch.annotations.Document}
|
||||||
|
* @param index the index from which to delete
|
||||||
|
* @return response with detailed information
|
||||||
|
* @deprecated since 5.3.0, use {@link #delete(DeleteQuery, Class, IndexCoordinates)}
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
ByQueryResponse delete(Query query, Class<?> clazz, IndexCoordinates index);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete all records matching the query.
|
* Delete all records matching the query.
|
||||||
*
|
*
|
||||||
|
@ -15,13 +15,13 @@
|
|||||||
*/
|
*/
|
||||||
package org.springframework.data.elasticsearch.core;
|
package org.springframework.data.elasticsearch.core;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.cluster.ClusterOperations;
|
import org.springframework.data.elasticsearch.core.cluster.ClusterOperations;
|
||||||
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
|
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
|
||||||
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
|
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
|
||||||
import org.springframework.data.elasticsearch.core.routing.RoutingResolver;
|
import org.springframework.data.elasticsearch.core.routing.RoutingResolver;
|
||||||
import org.springframework.data.elasticsearch.core.script.ScriptOperations;
|
import org.springframework.data.elasticsearch.core.script.ScriptOperations;
|
||||||
import org.springframework.data.elasticsearch.core.sql.SqlOperations;
|
import org.springframework.data.elasticsearch.core.sql.SqlOperations;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ElasticsearchOperations. Since 4.0 this interface only contains common helper functions, the other methods have been
|
* ElasticsearchOperations. Since 4.0 this interface only contains common helper functions, the other methods have been
|
||||||
|
@ -17,7 +17,6 @@ package org.springframework.data.elasticsearch.core;
|
|||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.core.convert.ConversionService;
|
import org.springframework.core.convert.ConversionService;
|
||||||
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
|
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
|
||||||
import org.springframework.data.elasticsearch.core.join.JoinField;
|
import org.springframework.data.elasticsearch.core.join.JoinField;
|
||||||
@ -30,6 +29,7 @@ import org.springframework.data.mapping.IdentifierAccessor;
|
|||||||
import org.springframework.data.mapping.PersistentPropertyAccessor;
|
import org.springframework.data.mapping.PersistentPropertyAccessor;
|
||||||
import org.springframework.data.mapping.context.MappingContext;
|
import org.springframework.data.mapping.context.MappingContext;
|
||||||
import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
|
import org.springframework.data.mapping.model.ConvertingPropertyAccessor;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -18,10 +18,10 @@ package org.springframework.data.elasticsearch.core;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.document.Document;
|
import org.springframework.data.elasticsearch.core.document.Document;
|
||||||
import org.springframework.data.elasticsearch.core.index.AliasData;
|
import org.springframework.data.elasticsearch.core.index.AliasData;
|
||||||
import org.springframework.data.elasticsearch.core.index.Settings;
|
import org.springframework.data.elasticsearch.core.index.Settings;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Immutable object that holds information(name, settings, mappings, aliases) about an Index
|
* Immutable object that holds information(name, settings, mappings, aliases) about an Index
|
||||||
|
@ -19,10 +19,10 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.document.Document;
|
import org.springframework.data.elasticsearch.core.document.Document;
|
||||||
import org.springframework.data.elasticsearch.core.index.*;
|
import org.springframework.data.elasticsearch.core.index.*;
|
||||||
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
|
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The operations for the
|
* The operations for the
|
||||||
|
@ -22,10 +22,10 @@ import java.util.Map;
|
|||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.document.Document;
|
import org.springframework.data.elasticsearch.core.document.Document;
|
||||||
import org.springframework.data.elasticsearch.core.index.*;
|
import org.springframework.data.elasticsearch.core.index.*;
|
||||||
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
|
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
*/
|
*/
|
||||||
package org.springframework.data.elasticsearch.core;
|
package org.springframework.data.elasticsearch.core;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Value class capturing information about a newly indexed document in Elasticsearch.
|
* Value class capturing information about a newly indexed document in Elasticsearch.
|
||||||
|
@ -15,8 +15,8 @@
|
|||||||
*/
|
*/
|
||||||
package org.springframework.data.elasticsearch.core;
|
package org.springframework.data.elasticsearch.core;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.ElasticsearchErrorCause;
|
import org.springframework.data.elasticsearch.ElasticsearchErrorCause;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Response object for items returned from multiget requests, encapsulating the returned data and potential error
|
* Response object for items returned from multiget requests, encapsulating the returned data and potential error
|
||||||
|
@ -326,6 +326,17 @@ public interface ReactiveDocumentOperations {
|
|||||||
*/
|
*/
|
||||||
Mono<String> delete(String id, Class<?> entityType);
|
Mono<String> delete(String id, Class<?> entityType);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete the documents matching the given {@link Query} extracting index from entity metadata.
|
||||||
|
*
|
||||||
|
* @param query must not be {@literal null}.
|
||||||
|
* @param entityType must not be {@literal null}.
|
||||||
|
* @return a {@link Mono} emitting the number of the removed documents.
|
||||||
|
* @deprecated since 5.3.0, use {@link #delete(DeleteQuery, Class)}
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
Mono<ByQueryResponse> delete(Query query, Class<?> entityType);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete the documents matching the given {@link Query} extracting index from entity metadata.
|
* Delete the documents matching the given {@link Query} extracting index from entity metadata.
|
||||||
*
|
*
|
||||||
@ -336,6 +347,18 @@ public interface ReactiveDocumentOperations {
|
|||||||
*/
|
*/
|
||||||
Mono<ByQueryResponse> delete(DeleteQuery query, Class<?> entityType);
|
Mono<ByQueryResponse> delete(DeleteQuery query, Class<?> entityType);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Delete the documents matching the given {@link Query} extracting index from entity metadata.
|
||||||
|
*
|
||||||
|
* @param query must not be {@literal null}.
|
||||||
|
* @param entityType must not be {@literal null}.
|
||||||
|
* @param index the target index, must not be {@literal null}
|
||||||
|
* @return a {@link Mono} emitting the number of the removed documents.
|
||||||
|
* @deprecated since 5.3.0, use {@link #delete(DeleteQuery, Class, IndexCoordinates)}
|
||||||
|
*/
|
||||||
|
@Deprecated
|
||||||
|
Mono<ByQueryResponse> delete(Query query, Class<?> entityType, IndexCoordinates index);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Delete the documents matching the given {@link Query} extracting index from entity metadata.
|
* Delete the documents matching the given {@link Query} extracting index from entity metadata.
|
||||||
*
|
*
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.springframework.data.elasticsearch.core;
|
package org.springframework.data.elasticsearch.core;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.cluster.ReactiveClusterOperations;
|
import org.springframework.data.elasticsearch.core.cluster.ReactiveClusterOperations;
|
||||||
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
|
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
|
||||||
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
|
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
|
||||||
@ -23,6 +22,7 @@ import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
|
|||||||
import org.springframework.data.elasticsearch.core.routing.RoutingResolver;
|
import org.springframework.data.elasticsearch.core.routing.RoutingResolver;
|
||||||
import org.springframework.data.elasticsearch.core.script.ReactiveScriptOperations;
|
import org.springframework.data.elasticsearch.core.script.ReactiveScriptOperations;
|
||||||
import org.springframework.data.elasticsearch.core.sql.ReactiveSqlOperations;
|
import org.springframework.data.elasticsearch.core.sql.ReactiveSqlOperations;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Interface that specifies a basic set of Elasticsearch operations executed in a reactive way.
|
* Interface that specifies a basic set of Elasticsearch operations executed in a reactive way.
|
||||||
|
@ -19,8 +19,8 @@ import reactor.core.publisher.Flux;
|
|||||||
|
|
||||||
import java.time.Duration;
|
import java.time.Duration;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.suggest.response.Suggest;
|
import org.springframework.data.elasticsearch.core.suggest.response.Suggest;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Encapsulates a Flux of {@link SearchHit}s with additional information from the search.
|
* Encapsulates a Flux of {@link SearchHit}s with additional information from the search.
|
||||||
|
@ -19,8 +19,8 @@ import reactor.core.publisher.Flux;
|
|||||||
|
|
||||||
import java.time.Duration;
|
import java.time.Duration;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.suggest.response.Suggest;
|
import org.springframework.data.elasticsearch.core.suggest.response.Suggest;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Peter-Josef Meisch
|
* @author Peter-Josef Meisch
|
||||||
|
@ -23,9 +23,9 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.document.Explanation;
|
import org.springframework.data.elasticsearch.core.document.Explanation;
|
||||||
import org.springframework.data.elasticsearch.core.document.NestedMetaData;
|
import org.springframework.data.elasticsearch.core.document.NestedMetaData;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -48,12 +48,12 @@ public class SearchHit<T> {
|
|||||||
@Nullable private final NestedMetaData nestedMetaData;
|
@Nullable private final NestedMetaData nestedMetaData;
|
||||||
@Nullable private final String routing;
|
@Nullable private final String routing;
|
||||||
@Nullable private final Explanation explanation;
|
@Nullable private final Explanation explanation;
|
||||||
private final Map<String, Double> matchedQueries = new LinkedHashMap<>();
|
private final List<String> matchedQueries = new ArrayList<>();
|
||||||
|
|
||||||
public SearchHit(@Nullable String index, @Nullable String id, @Nullable String routing, float score,
|
public SearchHit(@Nullable String index, @Nullable String id, @Nullable String routing, float score,
|
||||||
@Nullable Object[] sortValues, @Nullable Map<String, List<String>> highlightFields,
|
@Nullable Object[] sortValues, @Nullable Map<String, List<String>> highlightFields,
|
||||||
@Nullable Map<String, SearchHits<?>> innerHits, @Nullable NestedMetaData nestedMetaData,
|
@Nullable Map<String, SearchHits<?>> innerHits, @Nullable NestedMetaData nestedMetaData,
|
||||||
@Nullable Explanation explanation, @Nullable Map<String, Double> matchedQueries, T content) {
|
@Nullable Explanation explanation, @Nullable List<String> matchedQueries, T content) {
|
||||||
this.index = index;
|
this.index = index;
|
||||||
this.id = id;
|
this.id = id;
|
||||||
this.routing = routing;
|
this.routing = routing;
|
||||||
@ -73,7 +73,7 @@ public class SearchHit<T> {
|
|||||||
this.content = content;
|
this.content = content;
|
||||||
|
|
||||||
if (matchedQueries != null) {
|
if (matchedQueries != null) {
|
||||||
this.matchedQueries.putAll(matchedQueries);
|
this.matchedQueries.addAll(matchedQueries);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -194,7 +194,7 @@ public class SearchHit<T> {
|
|||||||
* @return the matched queries for this SearchHit.
|
* @return the matched queries for this SearchHit.
|
||||||
*/
|
*/
|
||||||
@Nullable
|
@Nullable
|
||||||
public Map<String, Double> getMatchedQueries() {
|
public List<String> getMatchedQueries() {
|
||||||
return matchedQueries;
|
return matchedQueries;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,6 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
|
import org.springframework.data.elasticsearch.UncategorizedElasticsearchException;
|
||||||
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
|
import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
|
||||||
import org.springframework.data.elasticsearch.core.document.Document;
|
import org.springframework.data.elasticsearch.core.document.Document;
|
||||||
@ -35,6 +34,7 @@ import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersiste
|
|||||||
import org.springframework.data.elasticsearch.core.suggest.response.CompletionSuggestion;
|
import org.springframework.data.elasticsearch.core.suggest.response.CompletionSuggestion;
|
||||||
import org.springframework.data.elasticsearch.core.suggest.response.Suggest;
|
import org.springframework.data.elasticsearch.core.suggest.response.Suggest;
|
||||||
import org.springframework.data.mapping.context.MappingContext;
|
import org.springframework.data.mapping.context.MappingContext;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -21,11 +21,11 @@ import java.util.List;
|
|||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import java.util.stream.Stream;
|
import java.util.stream.Stream;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.domain.PageImpl;
|
import org.springframework.data.domain.PageImpl;
|
||||||
import org.springframework.data.domain.Pageable;
|
import org.springframework.data.domain.Pageable;
|
||||||
import org.springframework.data.util.CloseableIterator;
|
import org.springframework.data.util.CloseableIterator;
|
||||||
import org.springframework.data.util.ReactiveWrappers;
|
import org.springframework.data.util.ReactiveWrappers;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Utility class with helper methods for working with {@link SearchHit}.
|
* Utility class with helper methods for working with {@link SearchHit}.
|
||||||
|
@ -19,9 +19,9 @@ import java.time.Duration;
|
|||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.suggest.response.Suggest;
|
import org.springframework.data.elasticsearch.core.suggest.response.Suggest;
|
||||||
import org.springframework.data.util.Streamable;
|
import org.springframework.data.util.Streamable;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Encapsulates a list of {@link SearchHit}s with additional information from the search.
|
* Encapsulates a list of {@link SearchHit}s with additional information from the search.
|
||||||
|
@ -19,9 +19,9 @@ import java.time.Duration;
|
|||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.suggest.response.Suggest;
|
import org.springframework.data.elasticsearch.core.suggest.response.Suggest;
|
||||||
import org.springframework.data.util.Lazy;
|
import org.springframework.data.util.Lazy;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -17,8 +17,8 @@ package org.springframework.data.elasticsearch.core;
|
|||||||
|
|
||||||
import java.time.Duration;
|
import java.time.Duration;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.util.CloseableIterator;
|
import org.springframework.data.util.CloseableIterator;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A {@link SearchHitsIterator} encapsulates {@link SearchHit} results that can be wrapped in a Java 8
|
* A {@link SearchHitsIterator} encapsulates {@link SearchHit} results that can be wrapped in a Java 8
|
||||||
|
@ -18,11 +18,11 @@ package org.springframework.data.elasticsearch.core;
|
|||||||
import java.time.Duration;
|
import java.time.Duration;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
|
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
|
||||||
import org.springframework.data.elasticsearch.core.query.BaseQueryBuilder;
|
import org.springframework.data.elasticsearch.core.query.BaseQueryBuilder;
|
||||||
import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
|
import org.springframework.data.elasticsearch.core.query.MoreLikeThisQuery;
|
||||||
import org.springframework.data.elasticsearch.core.query.Query;
|
import org.springframework.data.elasticsearch.core.query.Query;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The operations for the
|
* The operations for the
|
||||||
@ -233,8 +233,7 @@ public interface SearchOperations {
|
|||||||
Query idsQuery(List<String> ids);
|
Query idsQuery(List<String> ids);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Creates a {@link BaseQueryBuilder} that has the given ids setto the parameter value. No other properties of the
|
* Creates a {@link BaseQueryBuilder} that has the given ids setto the parameter value. No other properties of the bulder are set.
|
||||||
* bulder are set.
|
|
||||||
*
|
*
|
||||||
* @param ids the list of ids must not be {@literal null}
|
* @param ids the list of ids must not be {@literal null}
|
||||||
* @return query returning the documents with the given ids
|
* @return query returning the documents with the given ids
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
*/
|
*/
|
||||||
package org.springframework.data.elasticsearch.core;
|
package org.springframework.data.elasticsearch.core;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This interface is used to expose the current {@code scrollId} from the underlying scroll context.
|
* This interface is used to expose the current {@code scrollId} from the underlying scroll context.
|
||||||
|
@ -17,8 +17,8 @@ package org.springframework.data.elasticsearch.core;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.ElasticsearchErrorCause;
|
import org.springframework.data.elasticsearch.ElasticsearchErrorCause;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @author Haibo Liu
|
* @author Haibo Liu
|
||||||
|
@ -23,8 +23,8 @@ import java.util.concurrent.atomic.AtomicInteger;
|
|||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.client.util.ScrollState;
|
import org.springframework.data.elasticsearch.client.util.ScrollState;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
/**
|
/**
|
||||||
* Interfaces and classes related to Elasticsearch cluster information and management.
|
* Interfaces and classes related to Elasticsearch cluster information and management.
|
||||||
*/
|
*/
|
||||||
@org.jspecify.annotations.NullMarked
|
@org.springframework.lang.NonNullApi
|
||||||
|
@org.springframework.lang.NonNullFields
|
||||||
package org.springframework.data.elasticsearch.core.cluster;
|
package org.springframework.data.elasticsearch.core.cluster;
|
||||||
|
@ -19,7 +19,6 @@ import java.util.Collections;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.convert.DefaultTypeMapper;
|
import org.springframework.data.convert.DefaultTypeMapper;
|
||||||
import org.springframework.data.convert.SimpleTypeInformationMapper;
|
import org.springframework.data.convert.SimpleTypeInformationMapper;
|
||||||
import org.springframework.data.convert.TypeAliasAccessor;
|
import org.springframework.data.convert.TypeAliasAccessor;
|
||||||
@ -28,6 +27,7 @@ import org.springframework.data.mapping.Alias;
|
|||||||
import org.springframework.data.mapping.PersistentEntity;
|
import org.springframework.data.mapping.PersistentEntity;
|
||||||
import org.springframework.data.mapping.context.MappingContext;
|
import org.springframework.data.mapping.context.MappingContext;
|
||||||
import org.springframework.data.util.TypeInformation;
|
import org.springframework.data.util.TypeInformation;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Elasticsearch specific {@link org.springframework.data.convert.TypeMapper} implementation.
|
* Elasticsearch specific {@link org.springframework.data.convert.TypeMapper} implementation.
|
||||||
|
@ -15,7 +15,6 @@
|
|||||||
*/
|
*/
|
||||||
package org.springframework.data.elasticsearch.core.convert;
|
package org.springframework.data.elasticsearch.core.convert;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.convert.EntityConverter;
|
import org.springframework.data.convert.EntityConverter;
|
||||||
import org.springframework.data.elasticsearch.core.document.Document;
|
import org.springframework.data.elasticsearch.core.document.Document;
|
||||||
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
|
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
|
||||||
@ -24,6 +23,7 @@ import org.springframework.data.elasticsearch.core.mapping.PropertyValueConverte
|
|||||||
import org.springframework.data.elasticsearch.core.query.Query;
|
import org.springframework.data.elasticsearch.core.query.Query;
|
||||||
import org.springframework.data.projection.ProjectionFactory;
|
import org.springframework.data.projection.ProjectionFactory;
|
||||||
import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
|
import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -17,11 +17,11 @@ package org.springframework.data.elasticsearch.core.convert;
|
|||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.convert.TypeMapper;
|
import org.springframework.data.convert.TypeMapper;
|
||||||
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
|
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentEntity;
|
||||||
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
|
import org.springframework.data.elasticsearch.core.mapping.ElasticsearchPersistentProperty;
|
||||||
import org.springframework.data.mapping.context.MappingContext;
|
import org.springframework.data.mapping.context.MappingContext;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Elasticsearch specific {@link TypeMapper} definition.
|
* Elasticsearch specific {@link TypeMapper} definition.
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
*/
|
*/
|
||||||
package org.springframework.data.elasticsearch.core.convert;
|
package org.springframework.data.elasticsearch.core.convert;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @since 5.3
|
* @since 5.3
|
||||||
|
@ -24,7 +24,6 @@ import java.util.stream.Collectors;
|
|||||||
import org.apache.commons.logging.Log;
|
import org.apache.commons.logging.Log;
|
||||||
import org.apache.commons.logging.LogFactory;
|
import org.apache.commons.logging.LogFactory;
|
||||||
import org.jetbrains.annotations.NotNull;
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.beans.BeansException;
|
import org.springframework.beans.BeansException;
|
||||||
import org.springframework.beans.factory.InitializingBean;
|
import org.springframework.beans.factory.InitializingBean;
|
||||||
import org.springframework.context.ApplicationContext;
|
import org.springframework.context.ApplicationContext;
|
||||||
@ -39,7 +38,6 @@ import org.springframework.core.env.Environment;
|
|||||||
import org.springframework.core.env.EnvironmentCapable;
|
import org.springframework.core.env.EnvironmentCapable;
|
||||||
import org.springframework.core.env.StandardEnvironment;
|
import org.springframework.core.env.StandardEnvironment;
|
||||||
import org.springframework.data.convert.CustomConversions;
|
import org.springframework.data.convert.CustomConversions;
|
||||||
import org.springframework.data.domain.Sort;
|
|
||||||
import org.springframework.data.elasticsearch.annotations.FieldType;
|
import org.springframework.data.elasticsearch.annotations.FieldType;
|
||||||
import org.springframework.data.elasticsearch.annotations.ScriptedField;
|
import org.springframework.data.elasticsearch.annotations.ScriptedField;
|
||||||
import org.springframework.data.elasticsearch.core.document.Document;
|
import org.springframework.data.elasticsearch.core.document.Document;
|
||||||
@ -52,7 +50,6 @@ import org.springframework.data.elasticsearch.core.query.Criteria;
|
|||||||
import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
|
import org.springframework.data.elasticsearch.core.query.CriteriaQuery;
|
||||||
import org.springframework.data.elasticsearch.core.query.FetchSourceFilter;
|
import org.springframework.data.elasticsearch.core.query.FetchSourceFilter;
|
||||||
import org.springframework.data.elasticsearch.core.query.Field;
|
import org.springframework.data.elasticsearch.core.query.Field;
|
||||||
import org.springframework.data.elasticsearch.core.query.Order;
|
|
||||||
import org.springframework.data.elasticsearch.core.query.Query;
|
import org.springframework.data.elasticsearch.core.query.Query;
|
||||||
import org.springframework.data.elasticsearch.core.query.SeqNoPrimaryTerm;
|
import org.springframework.data.elasticsearch.core.query.SeqNoPrimaryTerm;
|
||||||
import org.springframework.data.elasticsearch.core.query.SourceFilter;
|
import org.springframework.data.elasticsearch.core.query.SourceFilter;
|
||||||
@ -66,6 +63,7 @@ import org.springframework.data.mapping.model.*;
|
|||||||
import org.springframework.data.util.TypeInformation;
|
import org.springframework.data.util.TypeInformation;
|
||||||
import org.springframework.expression.spel.standard.SpelExpressionParser;
|
import org.springframework.expression.spel.standard.SpelExpressionParser;
|
||||||
import org.springframework.format.datetime.DateFormatterRegistrar;
|
import org.springframework.format.datetime.DateFormatterRegistrar;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
import org.springframework.util.ClassUtils;
|
import org.springframework.util.ClassUtils;
|
||||||
import org.springframework.util.CollectionUtils;
|
import org.springframework.util.CollectionUtils;
|
||||||
@ -394,7 +392,7 @@ public class MappingElasticsearchConverter
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (source instanceof SearchDocument searchDocument) {
|
if (source instanceof SearchDocument searchDocument) {
|
||||||
populateScriptedFields(targetEntity, result, searchDocument);
|
populateScriptFields(targetEntity, result, searchDocument);
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
} catch (ConversionException e) {
|
} catch (ConversionException e) {
|
||||||
@ -652,16 +650,7 @@ public class MappingElasticsearchConverter
|
|||||||
return conversionService.convert(value, target);
|
return conversionService.convert(value, target);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
private <T> void populateScriptFields(ElasticsearchPersistentEntity<?> entity, T result,
|
||||||
* Checks if any of the properties of the entity is annotated with
|
|
||||||
*
|
|
||||||
* @{@link ScriptedField}. If so, the value of this property is set from the returned fields in the document.
|
|
||||||
* @param entity the entity to defining the persistent property
|
|
||||||
* @param result the rsult to populate
|
|
||||||
* @param searchDocument the search result caontaining the fields
|
|
||||||
* @param <T> the result type
|
|
||||||
*/
|
|
||||||
private <T> void populateScriptedFields(ElasticsearchPersistentEntity<?> entity, T result,
|
|
||||||
SearchDocument searchDocument) {
|
SearchDocument searchDocument) {
|
||||||
Map<String, List<Object>> fields = searchDocument.getFields();
|
Map<String, List<Object>> fields = searchDocument.getFields();
|
||||||
entity.doWithProperties((SimplePropertyHandler) property -> {
|
entity.doWithProperties((SimplePropertyHandler) property -> {
|
||||||
@ -670,15 +659,10 @@ public class MappingElasticsearchConverter
|
|||||||
// noinspection ConstantConditions
|
// noinspection ConstantConditions
|
||||||
String name = scriptedField.name().isEmpty() ? property.getName() : scriptedField.name();
|
String name = scriptedField.name().isEmpty() ? property.getName() : scriptedField.name();
|
||||||
if (fields.containsKey(name)) {
|
if (fields.containsKey(name)) {
|
||||||
if (property.isCollectionLike()) {
|
|
||||||
List<Object> values = searchDocument.getFieldValues(name);
|
|
||||||
entity.getPropertyAccessor(result).setProperty(property, values);
|
|
||||||
} else {
|
|
||||||
Object value = searchDocument.getFieldValue(name);
|
Object value = searchDocument.getFieldValue(name);
|
||||||
entity.getPropertyAccessor(result).setProperty(property, value);
|
entity.getPropertyAccessor(result).setProperty(property, value);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1247,7 +1231,7 @@ public class MappingElasticsearchConverter
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
updatePropertiesInFieldsSortAndSourceFilter(query, domainClass);
|
updatePropertiesInFieldsAndSourceFilter(query, domainClass);
|
||||||
|
|
||||||
if (query instanceof CriteriaQuery criteriaQuery) {
|
if (query instanceof CriteriaQuery criteriaQuery) {
|
||||||
updatePropertiesInCriteriaQuery(criteriaQuery, domainClass);
|
updatePropertiesInCriteriaQuery(criteriaQuery, domainClass);
|
||||||
@ -1258,14 +1242,7 @@ public class MappingElasticsearchConverter
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
private void updatePropertiesInFieldsAndSourceFilter(Query query, Class<?> domainClass) {
|
||||||
* replaces the names of fields in the query, the sort or soucre filters with the field names used in Elasticsearch
|
|
||||||
* when they are defined on the ElasticsearchProperties
|
|
||||||
*
|
|
||||||
* @param query the query to process
|
|
||||||
* @param domainClass the domain class (persistent entity)
|
|
||||||
*/
|
|
||||||
private void updatePropertiesInFieldsSortAndSourceFilter(Query query, Class<?> domainClass) {
|
|
||||||
|
|
||||||
ElasticsearchPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(domainClass);
|
ElasticsearchPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(domainClass);
|
||||||
|
|
||||||
@ -1273,12 +1250,12 @@ public class MappingElasticsearchConverter
|
|||||||
List<String> fields = query.getFields();
|
List<String> fields = query.getFields();
|
||||||
|
|
||||||
if (!fields.isEmpty()) {
|
if (!fields.isEmpty()) {
|
||||||
query.setFields(propertyToFieldNames(fields, persistentEntity));
|
query.setFields(updateFieldNames(fields, persistentEntity));
|
||||||
}
|
}
|
||||||
|
|
||||||
List<String> storedFields = query.getStoredFields();
|
List<String> storedFields = query.getStoredFields();
|
||||||
if (!CollectionUtils.isEmpty(storedFields)) {
|
if (!CollectionUtils.isEmpty(storedFields)) {
|
||||||
query.setStoredFields(propertyToFieldNames(storedFields, persistentEntity));
|
query.setStoredFields(updateFieldNames(storedFields, persistentEntity));
|
||||||
}
|
}
|
||||||
|
|
||||||
SourceFilter sourceFilter = query.getSourceFilter();
|
SourceFilter sourceFilter = query.getSourceFilter();
|
||||||
@ -1289,60 +1266,37 @@ public class MappingElasticsearchConverter
|
|||||||
String[] excludes = null;
|
String[] excludes = null;
|
||||||
|
|
||||||
if (sourceFilter.getIncludes() != null) {
|
if (sourceFilter.getIncludes() != null) {
|
||||||
includes = propertyToFieldNames(Arrays.asList(sourceFilter.getIncludes()), persistentEntity)
|
includes = updateFieldNames(Arrays.asList(sourceFilter.getIncludes()), persistentEntity)
|
||||||
.toArray(new String[] {});
|
.toArray(new String[] {});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (sourceFilter.getExcludes() != null) {
|
if (sourceFilter.getExcludes() != null) {
|
||||||
excludes = propertyToFieldNames(Arrays.asList(sourceFilter.getExcludes()), persistentEntity)
|
excludes = updateFieldNames(Arrays.asList(sourceFilter.getExcludes()), persistentEntity)
|
||||||
.toArray(new String[] {});
|
.toArray(new String[] {});
|
||||||
}
|
}
|
||||||
|
|
||||||
query.addSourceFilter(new FetchSourceFilter(sourceFilter.fetchSource(), includes, excludes));
|
query.addSourceFilter(new FetchSourceFilter(sourceFilter.fetchSource(), includes, excludes));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (query.getSort() != null) {
|
|
||||||
var sort = query.getSort();
|
|
||||||
// stream the orders and map them to a new order with the changed names,
|
|
||||||
// then replace the existing sort with a new sort containing the new orders.
|
|
||||||
var newOrders = sort.stream().map(order -> {
|
|
||||||
var fieldNames = updateFieldNames(order.getProperty(), persistentEntity);
|
|
||||||
|
|
||||||
if (order instanceof Order springDataElasticsearchOrder) {
|
|
||||||
return springDataElasticsearchOrder.withProperty(fieldNames);
|
|
||||||
} else {
|
|
||||||
return new Sort.Order(order.getDirection(),
|
|
||||||
fieldNames,
|
|
||||||
order.isIgnoreCase(),
|
|
||||||
order.getNullHandling());
|
|
||||||
}
|
|
||||||
}).toList();
|
|
||||||
|
|
||||||
if (query instanceof BaseQuery baseQuery) {
|
|
||||||
baseQuery.setSort(Sort.by(newOrders));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* replaces property name of a property of the persistentEntity with the corresponding fieldname. If no such property
|
* relaces the fieldName with the property name of a property of the persistentEntity with the corresponding
|
||||||
* exists, the original fieldName is kept.
|
* fieldname. If no such property exists, the original fieldName is kept.
|
||||||
*
|
*
|
||||||
* @param propertyNames list of fieldnames
|
* @param fieldNames list of fieldnames
|
||||||
* @param persistentEntity the persistent entity to check
|
* @param persistentEntity the persistent entity to check
|
||||||
* @return an updated list of field names
|
* @return an updated list of field names
|
||||||
*/
|
*/
|
||||||
private List<String> propertyToFieldNames(List<String> propertyNames,
|
private List<String> updateFieldNames(List<String> fieldNames, ElasticsearchPersistentEntity<?> persistentEntity) {
|
||||||
ElasticsearchPersistentEntity<?> persistentEntity) {
|
return fieldNames.stream().map(fieldName -> updateFieldName(persistentEntity, fieldName))
|
||||||
return propertyNames.stream().map(propertyName -> propertyToFieldName(persistentEntity, propertyName))
|
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
|
||||||
@NotNull
|
@NotNull
|
||||||
private String propertyToFieldName(ElasticsearchPersistentEntity<?> persistentEntity, String propertyName) {
|
private String updateFieldName(ElasticsearchPersistentEntity<?> persistentEntity, String fieldName) {
|
||||||
ElasticsearchPersistentProperty persistentProperty = persistentEntity.getPersistentProperty(propertyName);
|
ElasticsearchPersistentProperty persistentProperty = persistentEntity.getPersistentProperty(fieldName);
|
||||||
return persistentProperty != null ? persistentProperty.getFieldName() : propertyName;
|
return persistentProperty != null ? persistentProperty.getFieldName() : fieldName;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updatePropertiesInCriteriaQuery(CriteriaQuery criteriaQuery, Class<?> domainClass) {
|
private void updatePropertiesInCriteriaQuery(CriteriaQuery criteriaQuery, Class<?> domainClass) {
|
||||||
@ -1372,85 +1326,15 @@ public class MappingElasticsearchConverter
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
var propertyNamesUpdate = updatePropertyNames(persistentEntity, field.getName());
|
String[] fieldNames = field.getName().split("\\.");
|
||||||
|
|
||||||
var fieldNames = propertyNamesUpdate.names();
|
|
||||||
field.setName(String.join(".", fieldNames));
|
|
||||||
|
|
||||||
if (propertyNamesUpdate.propertyCount() > 1 && propertyNamesUpdate.nestedProperty()) {
|
|
||||||
List<String> propertyNames = Arrays.asList(fieldNames);
|
|
||||||
field.setPath(String.join(".", propertyNames.subList(0, propertyNamesUpdate.propertyCount - 1)));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (propertyNamesUpdate.persistentProperty != null) {
|
|
||||||
|
|
||||||
if (propertyNamesUpdate.persistentProperty.hasPropertyValueConverter()) {
|
|
||||||
PropertyValueConverter propertyValueConverter = Objects
|
|
||||||
.requireNonNull(propertyNamesUpdate.persistentProperty.getPropertyValueConverter());
|
|
||||||
criteria.getQueryCriteriaEntries().forEach(criteriaEntry -> {
|
|
||||||
|
|
||||||
if (criteriaEntry.getKey().hasValue()) {
|
|
||||||
Object value = criteriaEntry.getValue();
|
|
||||||
|
|
||||||
if (value.getClass().isArray()) {
|
|
||||||
Object[] objects = (Object[]) value;
|
|
||||||
|
|
||||||
for (int i = 0; i < objects.length; i++) {
|
|
||||||
objects[i] = propertyValueConverter.write(objects[i]);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
criteriaEntry.setValue(propertyValueConverter.write(value));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
org.springframework.data.elasticsearch.annotations.Field fieldAnnotation = propertyNamesUpdate.persistentProperty
|
|
||||||
.findAnnotation(org.springframework.data.elasticsearch.annotations.Field.class);
|
|
||||||
|
|
||||||
if (fieldAnnotation != null) {
|
|
||||||
field.setFieldType(fieldAnnotation.type());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static record PropertyNamesUpdate(
|
|
||||||
String[] names,
|
|
||||||
Boolean nestedProperty,
|
|
||||||
Integer propertyCount,
|
|
||||||
ElasticsearchPersistentProperty persistentProperty) {
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String updateFieldNames(String propertyPath, ElasticsearchPersistentEntity<?> persistentEntity) {
|
|
||||||
|
|
||||||
Assert.notNull(propertyPath, "propertyPath must not be null");
|
|
||||||
Assert.notNull(persistentEntity, "persistentEntity must not be null");
|
|
||||||
|
|
||||||
var propertyNamesUpdate = updatePropertyNames(persistentEntity, propertyPath);
|
|
||||||
return String.join(".", propertyNamesUpdate.names());
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Parse a propertyPath and replace the path values with the field names from a persistentEntity. path entries not
|
|
||||||
* found in the entity are kept as they are.
|
|
||||||
*
|
|
||||||
* @return the eventually modified names, a flag if a nested entity was encountered the number of processed
|
|
||||||
* propertiesand the last processed PersistentProperty.
|
|
||||||
*/
|
|
||||||
PropertyNamesUpdate updatePropertyNames(ElasticsearchPersistentEntity<?> persistentEntity, String propertyPath) {
|
|
||||||
|
|
||||||
String[] propertyNames = propertyPath.split("\\.");
|
|
||||||
String[] fieldNames = Arrays.copyOf(propertyNames, propertyNames.length);
|
|
||||||
|
|
||||||
ElasticsearchPersistentEntity<?> currentEntity = persistentEntity;
|
ElasticsearchPersistentEntity<?> currentEntity = persistentEntity;
|
||||||
ElasticsearchPersistentProperty persistentProperty = null;
|
ElasticsearchPersistentProperty persistentProperty = null;
|
||||||
|
|
||||||
int propertyCount = 0;
|
int propertyCount = 0;
|
||||||
boolean isNested = false;
|
boolean isNested = false;
|
||||||
|
|
||||||
for (int i = 0; i < propertyNames.length; i++) {
|
for (int i = 0; i < fieldNames.length; i++) {
|
||||||
persistentProperty = currentEntity.getPersistentProperty(propertyNames[i]);
|
persistentProperty = currentEntity.getPersistentProperty(fieldNames[i]);
|
||||||
|
|
||||||
if (persistentProperty != null) {
|
if (persistentProperty != null) {
|
||||||
propertyCount++;
|
propertyCount++;
|
||||||
@ -1477,8 +1361,77 @@ public class MappingElasticsearchConverter
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return new PropertyNamesUpdate(fieldNames, isNested, propertyCount, persistentProperty);
|
field.setName(String.join(".", fieldNames));
|
||||||
|
|
||||||
|
if (propertyCount > 1 && isNested) {
|
||||||
|
List<String> propertyNames = Arrays.asList(fieldNames);
|
||||||
|
field.setPath(String.join(".", propertyNames.subList(0, propertyCount - 1)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (persistentProperty != null) {
|
||||||
|
|
||||||
|
if (persistentProperty.hasPropertyValueConverter()) {
|
||||||
|
PropertyValueConverter propertyValueConverter = Objects
|
||||||
|
.requireNonNull(persistentProperty.getPropertyValueConverter());
|
||||||
|
criteria.getQueryCriteriaEntries().forEach(criteriaEntry -> {
|
||||||
|
|
||||||
|
if (criteriaEntry.getKey().hasValue()) {
|
||||||
|
Object value = criteriaEntry.getValue();
|
||||||
|
|
||||||
|
if (value.getClass().isArray()) {
|
||||||
|
Object[] objects = (Object[]) value;
|
||||||
|
|
||||||
|
for (int i = 0; i < objects.length; i++) {
|
||||||
|
objects[i] = propertyValueConverter.write(objects[i]);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
criteriaEntry.setValue(propertyValueConverter.write(value));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
org.springframework.data.elasticsearch.annotations.Field fieldAnnotation = persistentProperty
|
||||||
|
.findAnnotation(org.springframework.data.elasticsearch.annotations.Field.class);
|
||||||
|
|
||||||
|
if (fieldAnnotation != null) {
|
||||||
|
field.setFieldType(fieldAnnotation.type());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String updateFieldNames(String propertyPath, ElasticsearchPersistentEntity<?> persistentEntity) {
|
||||||
|
|
||||||
|
Assert.notNull(propertyPath, "propertyPath must not be null");
|
||||||
|
Assert.notNull(persistentEntity, "persistentEntity must not be null");
|
||||||
|
|
||||||
|
var properties = propertyPath.split("\\.", 2);
|
||||||
|
|
||||||
|
if (properties.length > 0) {
|
||||||
|
var propertyName = properties[0];
|
||||||
|
var fieldName = updateFieldName(persistentEntity, propertyName);
|
||||||
|
|
||||||
|
if (properties.length > 1) {
|
||||||
|
var persistentProperty = persistentEntity.getPersistentProperty(propertyName);
|
||||||
|
|
||||||
|
if (persistentProperty != null) {
|
||||||
|
ElasticsearchPersistentEntity<?> nestedPersistentEntity = mappingContext
|
||||||
|
.getPersistentEntity(persistentProperty);
|
||||||
|
if (nestedPersistentEntity != null) {
|
||||||
|
return fieldName + '.' + updateFieldNames(properties[1], nestedPersistentEntity);
|
||||||
|
} else {
|
||||||
|
return fieldName;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return fieldName;
|
||||||
|
} else {
|
||||||
|
return propertyPath;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
// endregion
|
// endregion
|
||||||
|
|
||||||
@SuppressWarnings("ClassCanBeRecord")
|
@SuppressWarnings("ClassCanBeRecord")
|
||||||
|
@ -1,2 +1,3 @@
|
|||||||
@org.jspecify.annotations.NullMarked
|
@org.springframework.lang.NonNullApi
|
||||||
|
@org.springframework.lang.NonNullFields
|
||||||
package org.springframework.data.elasticsearch.core.convert;
|
package org.springframework.data.elasticsearch.core.convert;
|
||||||
|
@ -20,9 +20,9 @@ import java.util.LinkedHashMap;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.convert.ConversionException;
|
import org.springframework.data.elasticsearch.core.convert.ConversionException;
|
||||||
import org.springframework.data.elasticsearch.support.StringObjectMap;
|
import org.springframework.data.elasticsearch.support.StringObjectMap;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -18,7 +18,7 @@ package org.springframework.data.elasticsearch.core.document;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Objects;
|
import java.util.Objects;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
import org.springframework.lang.Nullable;
|
||||||
import org.springframework.util.Assert;
|
import org.springframework.util.Assert;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -21,9 +21,10 @@ import java.util.Map;
|
|||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.BiConsumer;
|
import java.util.function.BiConsumer;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.support.DefaultStringObjectMap;
|
import org.springframework.data.elasticsearch.support.DefaultStringObjectMap;
|
||||||
|
import org.springframework.data.elasticsearch.support.StringObjectMap;
|
||||||
import org.springframework.data.mapping.MappingException;
|
import org.springframework.data.mapping.MappingException;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
*/
|
*/
|
||||||
package org.springframework.data.elasticsearch.core.document;
|
package org.springframework.data.elasticsearch.core.document;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* meta data returned for nested inner hits.
|
* meta data returned for nested inner hits.
|
||||||
|
@ -18,7 +18,7 @@ package org.springframework.data.elasticsearch.core.document;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Extension to {@link Document} exposing search response related data.
|
* Extension to {@link Document} exposing search response related data.
|
||||||
@ -57,20 +57,6 @@ public interface SearchDocument extends Document {
|
|||||||
return (V) values.get(0);
|
return (V) values.get(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param name the field name
|
|
||||||
* @param <V> the type of elements
|
|
||||||
* @return the values of the given field.
|
|
||||||
*/
|
|
||||||
@Nullable
|
|
||||||
default <V> List<V> getFieldValues(final String name) {
|
|
||||||
List<Object> values = getFields().get(name);
|
|
||||||
if (values == null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return (List<V>) values;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return the sort values for the search hit
|
* @return the sort values for the search hit
|
||||||
*/
|
*/
|
||||||
@ -125,5 +111,5 @@ public interface SearchDocument extends Document {
|
|||||||
* @return the matched queries for the SearchHit.
|
* @return the matched queries for the SearchHit.
|
||||||
*/
|
*/
|
||||||
@Nullable
|
@Nullable
|
||||||
Map<String, Double> getMatchedQueries();
|
List<String> getMatchedQueries();
|
||||||
}
|
}
|
||||||
|
@ -22,7 +22,7 @@ import java.util.Map;
|
|||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.function.BiConsumer;
|
import java.util.function.BiConsumer;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* {@link SearchDocument} implementation using a {@link Document} delegate.
|
* {@link SearchDocument} implementation using a {@link Document} delegate.
|
||||||
@ -41,12 +41,12 @@ public class SearchDocumentAdapter implements SearchDocument {
|
|||||||
private final Map<String, SearchDocumentResponse> innerHits = new HashMap<>();
|
private final Map<String, SearchDocumentResponse> innerHits = new HashMap<>();
|
||||||
@Nullable private final NestedMetaData nestedMetaData;
|
@Nullable private final NestedMetaData nestedMetaData;
|
||||||
@Nullable private final Explanation explanation;
|
@Nullable private final Explanation explanation;
|
||||||
@Nullable private final Map<String, Double> matchedQueries;
|
@Nullable private final List<String> matchedQueries;
|
||||||
@Nullable private final String routing;
|
@Nullable private final String routing;
|
||||||
|
|
||||||
public SearchDocumentAdapter(Document delegate, float score, Object[] sortValues, Map<String, List<Object>> fields,
|
public SearchDocumentAdapter(Document delegate, float score, Object[] sortValues, Map<String, List<Object>> fields,
|
||||||
Map<String, List<String>> highlightFields, Map<String, SearchDocumentResponse> innerHits,
|
Map<String, List<String>> highlightFields, Map<String, SearchDocumentResponse> innerHits,
|
||||||
@Nullable NestedMetaData nestedMetaData, @Nullable Explanation explanation, @Nullable Map<String, Double> matchedQueries,
|
@Nullable NestedMetaData nestedMetaData, @Nullable Explanation explanation, @Nullable List<String> matchedQueries,
|
||||||
@Nullable String routing) {
|
@Nullable String routing) {
|
||||||
|
|
||||||
this.delegate = delegate;
|
this.delegate = delegate;
|
||||||
@ -249,7 +249,7 @@ public class SearchDocumentAdapter implements SearchDocument {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
@Nullable
|
@Nullable
|
||||||
public Map<String, Double> getMatchedQueries() {
|
public List<String> getMatchedQueries() {
|
||||||
return matchedQueries;
|
return matchedQueries;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -20,10 +20,10 @@ import java.util.List;
|
|||||||
import java.util.concurrent.CompletableFuture;
|
import java.util.concurrent.CompletableFuture;
|
||||||
import java.util.function.Function;
|
import java.util.function.Function;
|
||||||
|
|
||||||
import org.jspecify.annotations.Nullable;
|
|
||||||
import org.springframework.data.elasticsearch.core.AggregationsContainer;
|
import org.springframework.data.elasticsearch.core.AggregationsContainer;
|
||||||
import org.springframework.data.elasticsearch.core.SearchShardStatistics;
|
import org.springframework.data.elasticsearch.core.SearchShardStatistics;
|
||||||
import org.springframework.data.elasticsearch.core.suggest.response.Suggest;
|
import org.springframework.data.elasticsearch.core.suggest.response.Suggest;
|
||||||
|
import org.springframework.lang.Nullable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This represents the complete search response from Elasticsearch, including the returned documents.
|
* This represents the complete search response from Elasticsearch, including the returned documents.
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
/**
|
/**
|
||||||
* Classes related to the Document structure of Elasticsearch documents and search responses.
|
* Classes related to the Document structure of Elasticsearch documents and search responses.
|
||||||
*/
|
*/
|
||||||
@org.jspecify.annotations.NullMarked
|
@org.springframework.lang.NonNullApi
|
||||||
|
@org.springframework.lang.NonNullFields
|
||||||
package org.springframework.data.elasticsearch.core.document;
|
package org.springframework.data.elasticsearch.core.document;
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
/**
|
/**
|
||||||
* classes and interfaces related to Spring Data Elasticsearch events and callbacks.
|
* classes and interfaces related to Spring Data Elasticsearch events and callbacks.
|
||||||
*/
|
*/
|
||||||
@org.jspecify.annotations.NullMarked
|
@org.springframework.lang.NonNullApi
|
||||||
|
@org.springframework.lang.NonNullFields
|
||||||
package org.springframework.data.elasticsearch.core.event;
|
package org.springframework.data.elasticsearch.core.event;
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user