17
17
18
18
import static org .springframework .util .StringUtils .*;
19
19
20
+ import co .elastic .clients .elasticsearch .ElasticsearchClient ;
20
21
import jakarta .annotation .PreDestroy ;
21
22
import jakarta .enterprise .context .ApplicationScoped ;
22
23
import jakarta .enterprise .inject .Produces ;
23
24
24
- import org .elasticsearch .client .RestHighLevelClient ;
25
25
import org .springframework .data .elasticsearch .client .ClientConfiguration ;
26
- import org .springframework .data .elasticsearch .client .erhlc .RestClients ;
26
+ import org .springframework .data .elasticsearch .client .elc .ElasticsearchClients ;
27
+ import org .springframework .data .elasticsearch .client .elc .ElasticsearchTemplate ;
27
28
import org .springframework .data .elasticsearch .core .ElasticsearchOperations ;
28
- import org .springframework .data .elasticsearch .client .erhlc .ElasticsearchRestTemplate ;
29
29
import org .springframework .data .elasticsearch .junit .jupiter .ClusterConnection ;
30
30
import org .springframework .data .elasticsearch .junit .jupiter .ClusterConnectionInfo ;
31
31
36
36
@ ApplicationScoped
37
37
class ElasticsearchOperationsProducer {
38
38
39
- // todo #1973 switch to use the new client
40
39
@ Produces
41
- public ElasticsearchOperations createElasticsearchTemplate (RestHighLevelClient restHighLevelClient ) {
42
- return new ElasticsearchRestTemplate ( restHighLevelClient );
40
+ public ElasticsearchOperations createElasticsearchTemplate (ElasticsearchClient elasticsearchClient ) {
41
+ return new ElasticsearchTemplate ( elasticsearchClient );
43
42
}
44
43
45
44
@ Produces
46
45
@ OtherQualifier
47
46
@ PersonDB
48
- public ElasticsearchOperations createQualifiedElasticsearchTemplate (RestHighLevelClient restHighLevelClient ) {
49
- return new ElasticsearchRestTemplate ( restHighLevelClient );
47
+ public ElasticsearchOperations createQualifiedElasticsearchTemplate (ElasticsearchClient elasticsearchClient ) {
48
+ return new ElasticsearchTemplate ( elasticsearchClient );
50
49
}
51
50
52
51
@ PreDestroy
@@ -55,7 +54,7 @@ public void shutdown() {
55
54
}
56
55
57
56
@ Produces
58
- public RestHighLevelClient elasticsearchClient () {
57
+ public ElasticsearchClient elasticsearchClient () {
59
58
// we rely on the tests being run with the SpringDataElasticsearchExtension class that sets up a containerized ES.
60
59
ClusterConnectionInfo connectionInfo = ClusterConnection .clusterConnectionInfo ();
61
60
@@ -72,6 +71,6 @@ public RestHighLevelClient elasticsearchClient() {
72
71
ClientConfiguration clientConfiguration = configurationBuilder //
73
72
.build ();
74
73
75
- return RestClients . create (clientConfiguration ). rest ( );
74
+ return ElasticsearchClients . createImperative (clientConfiguration );
76
75
}
77
76
}
0 commit comments