Skip to content

Commit 98a8d1a

Browse files
sothawosothawo
committed
Polishing
1 parent 005d6a4 commit 98a8d1a

File tree

5 files changed

+50
-56
lines changed

5 files changed

+50
-56
lines changed

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import io.netty.handler.ssl.JdkSslContext;
2323
import io.netty.handler.timeout.ReadTimeoutHandler;
2424
import io.netty.handler.timeout.WriteTimeoutHandler;
25-
import org.elasticsearch.action.get.MultiGetItemResponse;
2625
import reactor.core.publisher.Flux;
2726
import reactor.core.publisher.Mono;
2827
import reactor.netty.http.client.HttpClient;
@@ -64,6 +63,7 @@
6463
import org.elasticsearch.action.delete.DeleteResponse;
6564
import org.elasticsearch.action.get.GetRequest;
6665
import org.elasticsearch.action.get.GetResponse;
66+
import org.elasticsearch.action.get.MultiGetItemResponse;
6767
import org.elasticsearch.action.get.MultiGetRequest;
6868
import org.elasticsearch.action.get.MultiGetResponse;
6969
import org.elasticsearch.action.index.IndexRequest;
@@ -409,8 +409,7 @@ public Mono<Long> count(HttpHeaders headers, SearchRequest searchRequest) {
409409
@Override
410410
public Flux<SearchHit> searchTemplate(HttpHeaders headers, SearchTemplateRequest searchTemplateRequest) {
411411
return sendRequest(searchTemplateRequest, requestCreator.searchTemplate(), SearchTemplateResponse.class, headers)
412-
.map(r -> r.getResponse().getHits())
413-
.flatMap(Flux::fromIterable);
412+
.map(response -> response.getResponse().getHits()).flatMap(Flux::fromIterable);
414413
}
415414

416415
/*
@@ -876,10 +875,9 @@ private <T> Publisher<? extends T> handleServerError(Request request, ClientResp
876875
String mediaType = response.headers().contentType().map(MediaType::toString).orElse(XContentType.JSON.mediaType());
877876

878877
return response.body(BodyExtractors.toMono(byte[].class)) //
879-
.switchIfEmpty(Mono
880-
.error(new ElasticsearchStatusException(String.format("%s request to %s returned error code %s and no body.",
881-
request.getMethod(), request.getEndpoint(), statusCode), status))
882-
)
878+
.switchIfEmpty(Mono.error(
879+
new ElasticsearchStatusException(String.format("%s request to %s returned error code %s and no body.",
880+
request.getMethod(), request.getEndpoint(), statusCode), status)))
883881
.map(bytes -> new String(bytes, StandardCharsets.UTF_8)) //
884882
.flatMap(content -> contentOrError(content, mediaType, status))
885883
.flatMap(unused -> Mono

‎src/main/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClient.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ default Mono<Long> count(SearchRequest searchRequest) {
391391
*
392392
* @param consumer must not be {@literal null}.
393393
* @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-template.html">Search Template
394-
* API on elastic.co</a>
394+
* API on elastic.co</a>
395395
* @return the {@link Flux} emitting {@link SearchHit hits} one by one.
396396
*/
397397
default Flux<SearchHit> searchTemplate(Consumer<SearchTemplateRequest> consumer) {
@@ -405,7 +405,7 @@ default Flux<SearchHit> searchTemplate(Consumer<SearchTemplateRequest> consumer)
405405
*
406406
* @param searchTemplateRequest must not be {@literal null}.
407407
* @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-template.html">Search Template
408-
* API on elastic.co</a>
408+
* API on elastic.co</a>
409409
* @return the {@link Flux} emitting {@link SearchHit hits} one by one.
410410
*/
411411
default Flux<SearchHit> searchTemplate(SearchTemplateRequest searchTemplateRequest) {
@@ -418,7 +418,7 @@ default Flux<SearchHit> searchTemplate(SearchTemplateRequest searchTemplateReque
418418
* @param headers Use {@link HttpHeaders} to provide eg. authentication data. Must not be {@literal null}.
419419
* @param searchTemplateRequest must not be {@literal null}.
420420
* @see <a href="https://www.elastic.co/guide/en/elasticsearch/reference/current/search-template.html">Search Template
421-
* API on elastic.co</a>
421+
* API on elastic.co</a>
422422
* @return the {@link Flux} emitting {@link SearchHit hits} one by one.
423423
*/
424424
Flux<SearchHit> searchTemplate(HttpHeaders headers, SearchTemplateRequest searchTemplateRequest);

‎src/main/java/org/springframework/data/elasticsearch/client/util/RequestConverters.java

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ public static Request searchTemplate(SearchTemplateRequest templateRequest) {
416416
SearchRequest searchRequest = templateRequest.getRequest();
417417

418418
String endpoint = new EndpointBuilder().addCommaSeparatedPathParts(templateRequest.getRequest().indices())
419-
.addPathPart("_search").addPathPart("template").build();
419+
.addPathPart("_search").addPathPart("template").build();
420420

421421
Request request = new Request(HttpMethod.GET.name(), endpoint);
422422
Params params = new Params(request);
@@ -751,21 +751,21 @@ public static Request indexExists(GetIndexRequest getIndexRequest) {
751751
return request;
752752
}
753753

754-
public static Request indexExists(org.elasticsearch.client.indices.GetIndexRequest getIndexRequest) {
755-
// this can be called with no indices as argument by transport client, not via REST though
756-
if (getIndexRequest.indices() == null || getIndexRequest.indices().length == 0) {
757-
throw new IllegalArgumentException("indices are mandatory");
758-
}
759-
String endpoint = endpoint(getIndexRequest.indices(), "");
760-
Request request = new Request(HttpMethod.HEAD.name(), endpoint);
754+
public static Request indexExists(org.elasticsearch.client.indices.GetIndexRequest getIndexRequest) {
755+
// this can be called with no indices as argument by transport client, not via REST though
756+
if (getIndexRequest.indices() == null || getIndexRequest.indices().length == 0) {
757+
throw new IllegalArgumentException("indices are mandatory");
758+
}
759+
String endpoint = endpoint(getIndexRequest.indices(), "");
760+
Request request = new Request(HttpMethod.HEAD.name(), endpoint);
761761

762-
Params params = new Params(request);
763-
params.withLocal(getIndexRequest.local());
764-
params.withHuman(getIndexRequest.humanReadable());
765-
params.withIndicesOptions(getIndexRequest.indicesOptions());
766-
params.withIncludeDefaults(getIndexRequest.includeDefaults());
767-
return request;
768-
}
762+
Params params = new Params(request);
763+
params.withLocal(getIndexRequest.local());
764+
params.withHuman(getIndexRequest.humanReadable());
765+
params.withIndicesOptions(getIndexRequest.indicesOptions());
766+
params.withIncludeDefaults(getIndexRequest.includeDefaults());
767+
return request;
768+
}
769769

770770
public static Request indexOpen(OpenIndexRequest openIndexRequest) {
771771
String endpoint = RequestConverters.endpoint(openIndexRequest.indices(), "_open");
@@ -804,7 +804,7 @@ public static Request indexCreate(CreateIndexRequest createIndexRequest) {
804804
}
805805

806806
public static Request indexCreate(org.elasticsearch.client.indices.CreateIndexRequest createIndexRequest) {
807-
String endpoint = RequestConverters.endpoint(new String[]{createIndexRequest.index()});
807+
String endpoint = RequestConverters.endpoint(new String[] { createIndexRequest.index() });
808808
Request request = new Request(HttpMethod.PUT.name(), endpoint);
809809

810810
Params parameters = new Params(request);
@@ -846,17 +846,17 @@ public static Request putMapping(PutMappingRequest putMappingRequest) {
846846
return request;
847847
}
848848

849-
public static Request putMapping(org.elasticsearch.client.indices.PutMappingRequest putMappingRequest) {
850-
Request request = new Request(HttpMethod.PUT.name(),
851-
RequestConverters.endpoint(putMappingRequest.indices(), "_mapping"));
849+
public static Request putMapping(org.elasticsearch.client.indices.PutMappingRequest putMappingRequest) {
850+
Request request = new Request(HttpMethod.PUT.name(),
851+
RequestConverters.endpoint(putMappingRequest.indices(), "_mapping"));
852852

853-
new RequestConverters.Params(request) //
854-
.withTimeout(putMappingRequest.timeout()) //
855-
.withMasterTimeout(putMappingRequest.masterNodeTimeout()) //
856-
.withIncludeTypeName(false);
857-
request.setEntity(RequestConverters.createEntity(putMappingRequest, RequestConverters.REQUEST_BODY_CONTENT_TYPE));
858-
return request;
859-
}
853+
new RequestConverters.Params(request) //
854+
.withTimeout(putMappingRequest.timeout()) //
855+
.withMasterTimeout(putMappingRequest.masterNodeTimeout()) //
856+
.withIncludeTypeName(false);
857+
request.setEntity(RequestConverters.createEntity(putMappingRequest, RequestConverters.REQUEST_BODY_CONTENT_TYPE));
858+
return request;
859+
}
860860

861861
public static Request flushIndex(FlushRequest flushRequest) {
862862
String[] indices = flushRequest.indices() == null ? Strings.EMPTY_ARRAY : flushRequest.indices();
@@ -883,10 +883,10 @@ public static Request getMapping(GetMappingsRequest getMappingsRequest) {
883883
return request;
884884
}
885885

886-
public static Request getMapping(org.elasticsearch.client.indices.GetMappingsRequest getMappingsRequest) {
887-
String[] indices = getMappingsRequest.indices() == null ? Strings.EMPTY_ARRAY : getMappingsRequest.indices();
886+
public static Request getMapping(org.elasticsearch.client.indices.GetMappingsRequest getMappingsRequest) {
887+
String[] indices = getMappingsRequest.indices() == null ? Strings.EMPTY_ARRAY : getMappingsRequest.indices();
888888

889-
Request request = new Request(HttpMethod.GET.name(), RequestConverters.endpoint(indices, "_mapping"));
889+
Request request = new Request(HttpMethod.GET.name(), RequestConverters.endpoint(indices, "_mapping"));
890890

891891
RequestConverters.Params parameters = new RequestConverters.Params(request);
892892
parameters.withMasterTimeout(getMappingsRequest.masterNodeTimeout());

‎src/main/java/org/springframework/data/elasticsearch/core/query/NativeSearchQueryBuilder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public NativeSearchQueryBuilder withIndicesBoost(List<IndexBoost> indicesBoost)
120120
return this;
121121
}
122122

123-
public NativeSearchQueryBuilder withSearchTemplate(SearchTemplateRequestBuilder searchTemplateBuilder){
123+
public NativeSearchQueryBuilder withSearchTemplate(SearchTemplateRequestBuilder searchTemplateBuilder) {
124124
this.searchTemplateBuilder = searchTemplateBuilder;
125125
return this;
126126
}

‎src/test/java/org/springframework/data/elasticsearch/client/reactive/ReactiveElasticsearchClientIntegrationTests.java

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -454,10 +454,7 @@ public void inlineSearchTemplateShouldFindMatchingDocuments() {
454454
params.put("firstname", "inline");
455455
request.setScriptParams(params);
456456

457-
client.searchTemplate(request)
458-
.as(StepVerifier::create)
459-
.expectNextCount(1)
460-
.verifyComplete();
457+
client.searchTemplate(request).as(StepVerifier::create).expectNextCount(1).verifyComplete();
461458
}
462459

463460
@Test // #1725
@@ -471,14 +468,13 @@ public void storedSearchTemplateShouldFindMatchingDocuments() {
471468
testDoc.put("lastname", "template");
472469
add(testDoc).to(INDEX_I);
473470

474-
client.execute(c -> c.post()
475-
.uri(builder -> builder.path("_scripts/searchbyfirstname").build())
476-
.contentType(MediaType.APPLICATION_JSON)
477-
.bodyValue(
478-
"{\"script\":{\"lang\":\"mustache\",\"source\":{\"query\":{\"match\":{\"firstname\":\"{{firstname}}\"}}}}}")
479-
.retrieve()
480-
.bodyToMono(Void.class))
481-
.block();
471+
client.execute(c -> c.post().uri(builder -> builder.path("_scripts/searchbyfirstname").build())
472+
.contentType(MediaType.APPLICATION_JSON)
473+
.bodyValue(
474+
"{\"script\":{\"lang\":\"mustache\",\"source\":{\"query\":{\"match\":{\"firstname\":\"{{firstname}}\"}}}}}")
475+
.retrieve().bodyToMono(Void.class)).block();
476+
477+
client.indices().refreshIndex(request -> request.indices(INDEX_I)).block();
482478

483479
SearchTemplateRequest request = new SearchTemplateRequest(new SearchRequest(INDEX_I));
484480
request.setScriptType(ScriptType.STORED);
@@ -487,10 +483,10 @@ public void storedSearchTemplateShouldFindMatchingDocuments() {
487483
params.put("firstname", "stored");
488484
request.setScriptParams(params);
489485

490-
client.searchTemplate(request)
491-
.as(StepVerifier::create)
492-
.expectNextCount(1)
493-
.verifyComplete();
486+
client.searchTemplate(request) //
487+
.as(StepVerifier::create) //
488+
.expectNextCount(1) //
489+
.verifyComplete(); //
494490
}
495491

496492
@Test // DATAES-488

0 commit comments

Comments
 (0)