Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-05-31 09:12:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-870 - Polishing.

Browse Source 
Simplify single-node flow.
This commit is contained in:
Mark Paluch 2020-06-23 09:01:10 +02:00
parent 6332534ea1
commit 5b1e179e88
No known key found for this signature in database
GPG Key ID: 51A00FA751B91849
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,6 @@
*/
package org.springframework.data.elasticsearch.client.reactive;
import org.springframework.http.HttpHeaders;
import reactor.core.publisher.Mono;
import java.net.InetSocketAddress;
@ -25,6 +24,7 @@ import java.util.function.Supplier;
import org.springframework.data.elasticsearch.client.ElasticsearchHost;
import org.springframework.data.elasticsearch.client.ElasticsearchHost.State;
import org.springframework.data.elasticsearch.client.NoReachableHostException;
import org.springframework.http.HttpHeaders;
import org.springframework.web.reactive.function.client.WebClient;
/**
@ -60,20 +60,20 @@ class SingleNodeHostProvider implements HostProvider {
.head().uri("/")
.headers(httpHeaders -> httpHeaders.addAll(headersSupplier.get())) //
.exchange() //
.flatMap(it -> {
.map(it -> {
if (it.statusCode().isError()) {
state = ElasticsearchHost.offline(endpoint);
} else {
state = ElasticsearchHost.online(endpoint);
}
return Mono.just(state);
return state;
}).onErrorResume(throwable -> {
state = ElasticsearchHost.offline(endpoint);
clientProvider.getErrorListener().accept(throwable);
return Mono.just(state);
}) //
.flatMap(it -> Mono.just(new ClusterInformation(Collections.singleton(it))));
.map(it -> new ClusterInformation(Collections.singleton(it)));
}
/*
@ -96,14 +96,16 @@ class SingleNodeHostProvider implements HostProvider {
return Mono.just(endpoint);
}
return clusterInfo().flatMap(it -> {
return clusterInfo().handle((information, sink) -> {
ElasticsearchHost host = it.getNodes().iterator().next();
ElasticsearchHost host = information.getNodes().iterator().next();
if (host.isOnline()) {
return Mono.just(host.getEndpoint());
sink.next(host.getEndpoint());
return;
}
return Mono.error(() -> new NoReachableHostException(Collections.singleton(host)));
sink.error(new NoReachableHostException(Collections.singleton(host)));
});
}