Skip to content

Commit 17a25cb

Browse files
sothawosothawo
committed
Polishing
1 parent 3bc01a4 commit 17a25cb

File tree

2 files changed

+52
-62
lines changed

2 files changed

+52
-62
lines changed

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

+18-28
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,7 @@
7979
import org.elasticsearch.action.update.UpdateResponse;
8080
import org.elasticsearch.client.GetAliasesResponse;
8181
import org.elasticsearch.client.Request;
82-
import org.elasticsearch.client.indices.CreateIndexRequest;
83-
import org.elasticsearch.client.indices.GetFieldMappingsRequest;
84-
import org.elasticsearch.client.indices.GetFieldMappingsResponse;
85-
import org.elasticsearch.client.indices.GetIndexRequest;
86-
import org.elasticsearch.client.indices.GetIndexResponse;
87-
import org.elasticsearch.client.indices.GetIndexTemplatesRequest;
88-
import org.elasticsearch.client.indices.GetIndexTemplatesResponse;
89-
import org.elasticsearch.client.indices.GetMappingsRequest;
90-
import org.elasticsearch.client.indices.GetMappingsResponse;
91-
import org.elasticsearch.client.indices.IndexTemplatesExistRequest;
92-
import org.elasticsearch.client.indices.PutIndexTemplateRequest;
93-
import org.elasticsearch.client.indices.PutMappingRequest;
82+
import org.elasticsearch.client.indices.*;
9483
import org.elasticsearch.common.unit.TimeValue;
9584
import org.elasticsearch.common.xcontent.DeprecationHandler;
9685
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
@@ -647,7 +636,7 @@ private RequestBodySpec sendRequest(WebClient webClient, String logId, Request r
647636
// region indices operations
648637
@Override
649638
public Mono<Boolean> createIndex(HttpHeaders headers,
650-
org.elasticsearch.action.admin.indices.create.CreateIndexRequest createIndexRequest) {
639+
org.elasticsearch.action.admin.indices.create.CreateIndexRequest createIndexRequest) {
651640

652641
return sendRequest(createIndexRequest, requestCreator.indexCreate(), AcknowledgedResponse.class, headers) //
653642
.map(AcknowledgedResponse::isAcknowledged) //
@@ -670,21 +659,22 @@ public Mono<Void> closeIndex(HttpHeaders headers, CloseIndexRequest closeIndexRe
670659
}
671660

672661
@Override
673-
public Mono<Boolean> existsIndex(HttpHeaders headers, org.elasticsearch.action.admin.indices.get.GetIndexRequest request) {
662+
public Mono<Boolean> existsIndex(HttpHeaders headers,
663+
org.elasticsearch.action.admin.indices.get.GetIndexRequest request) {
674664

675665
return sendRequest(request, requestCreator.indexExists(), RawActionResponse.class, headers) //
676666
.flatMap(response -> response.releaseBody().thenReturn(response.statusCode().is2xxSuccessful())) //
677667
.next();
678668
}
679669

680-
@Override
681-
public Mono<Boolean> existsIndex(HttpHeaders headers, GetIndexRequest request) {
682-
return sendRequest(request, requestCreator.indexExistsRequest(), RawActionResponse.class, headers) //
683-
.flatMap(response -> response.releaseBody().thenReturn(response.statusCode().is2xxSuccessful())) //
684-
.next();
685-
}
670+
@Override
671+
public Mono<Boolean> existsIndex(HttpHeaders headers, GetIndexRequest request) {
672+
return sendRequest(request, requestCreator.indexExistsRequest(), RawActionResponse.class, headers) //
673+
.flatMap(response -> response.releaseBody().thenReturn(response.statusCode().is2xxSuccessful())) //
674+
.next();
675+
}
686676

687-
@Override
677+
@Override
688678
public Mono<Boolean> deleteIndex(HttpHeaders headers, DeleteIndexRequest request) {
689679

690680
return sendRequest(request, requestCreator.indexDelete(), AcknowledgedResponse.class, headers) //
@@ -701,15 +691,15 @@ public Mono<Void> flushIndex(HttpHeaders headers, FlushRequest flushRequest) {
701691

702692
@Override
703693
public Mono<org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse> getMapping(HttpHeaders headers,
704-
org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest getMappingsRequest) {
694+
org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest getMappingsRequest) {
705695
return sendRequest(getMappingsRequest, requestCreator.getMapping(),
706-
org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse.class, headers).next();
696+
org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse.class, headers).next();
707697
}
708698

709699
@Override
710700
public Mono<GetMappingsResponse> getMapping(HttpHeaders headers, GetMappingsRequest getMappingsRequest) {
711701
return sendRequest(getMappingsRequest, requestCreator.getMappingRequest(), GetMappingsResponse.class, headers) //
712-
.next();
702+
.next();
713703
}
714704

715705
@Override
@@ -726,7 +716,7 @@ public Mono<GetSettingsResponse> getSettings(HttpHeaders headers, GetSettingsReq
726716

727717
@Override
728718
public Mono<Boolean> putMapping(HttpHeaders headers,
729-
org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest putMappingRequest) {
719+
org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest putMappingRequest) {
730720

731721
return sendRequest(putMappingRequest, requestCreator.putMapping(), AcknowledgedResponse.class, headers) //
732722
.map(AcknowledgedResponse::isAcknowledged) //
@@ -735,9 +725,9 @@ public Mono<Boolean> putMapping(HttpHeaders headers,
735725

736726
@Override
737727
public Mono<Boolean> putMapping(HttpHeaders headers, PutMappingRequest putMappingRequest) {
738-
return sendRequest(putMappingRequest, requestCreator.putMappingRequest(), AcknowledgedResponse.class, headers) //
739-
.map(AcknowledgedResponse::isAcknowledged) //
740-
.next();
728+
return sendRequest(putMappingRequest, requestCreator.putMappingRequest(), AcknowledgedResponse.class, headers) //
729+
.map(AcknowledgedResponse::isAcknowledged) //
730+
.next();
741731
}
742732

743733
@Override

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/client/reactive/RequestCreator.java

+34-34
Original file line numberDiff line numberDiff line change
@@ -114,36 +114,36 @@ default Function<BulkRequest, Request> bulk() {
114114

115115
// --> INDICES
116116

117-
/**
118-
* @deprecated since 4.2
119-
*/
120-
@Deprecated
117+
/**
118+
* @deprecated since 4.2
119+
*/
120+
@Deprecated
121121
default Function<org.elasticsearch.action.admin.indices.get.GetIndexRequest, Request> indexExists() {
122122
return RequestConverters::indexExists;
123123
}
124124

125-
/**
126-
* @since 4.2
127-
*/
128-
default Function<GetIndexRequest, Request> indexExistsRequest() {
129-
return RequestConverters::indexExists;
130-
}
125+
/**
126+
* @since 4.2
127+
*/
128+
default Function<GetIndexRequest, Request> indexExistsRequest() {
129+
return RequestConverters::indexExists;
130+
}
131131

132132
default Function<DeleteIndexRequest, Request> indexDelete() {
133133
return RequestConverters::indexDelete;
134134
}
135135

136-
/**
137-
* @deprecated since 4.2
138-
*/
139-
@Deprecated
136+
/**
137+
* @deprecated since 4.2
138+
*/
139+
@Deprecated
140140
default Function<org.elasticsearch.action.admin.indices.create.CreateIndexRequest, Request> indexCreate() {
141141
return RequestConverters::indexCreate;
142142
}
143143

144-
/**
145-
* @since 4.2
146-
*/
144+
/**
145+
* @since 4.2
146+
*/
147147
default Function<CreateIndexRequest, Request> createIndexRequest() {
148148
return RequestConverters::indexCreate;
149149
}
@@ -160,20 +160,20 @@ default Function<RefreshRequest, Request> indexRefresh() {
160160
return RequestConverters::indexRefresh;
161161
}
162162

163-
/**
164-
* @deprecated since 4.2
165-
*/
166-
@Deprecated
163+
/**
164+
* @deprecated since 4.2
165+
*/
166+
@Deprecated
167167
default Function<org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest, Request> putMapping() {
168168
return RequestConverters::putMapping;
169169
}
170170

171-
/**
172-
* @since 4.2
173-
*/
174-
default Function<PutMappingRequest, Request> putMappingRequest() {
175-
return RequestConverters::putMapping;
176-
}
171+
/**
172+
* @since 4.2
173+
*/
174+
default Function<PutMappingRequest, Request> putMappingRequest() {
175+
return RequestConverters::putMapping;
176+
}
177177

178178
default Function<FlushRequest, Request> flushIndex() {
179179
return RequestConverters::flushIndex;
@@ -192,19 +192,19 @@ default Function<GetSettingsRequest, Request> getSettings() {
192192

193193
/**
194194
* @since 4.1
195-
* @deprecated since 4.2
195+
* @deprecated since 4.2
196196
*/
197197
@Deprecated
198198
default Function<org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest, Request> getMapping() {
199199
return RequestConverters::getMapping;
200200
}
201201

202-
/**
203-
* @since 4.2
204-
*/
205-
default Function<GetMappingsRequest, Request> getMappingRequest() {
206-
return RequestConverters::getMapping;
207-
}
202+
/**
203+
* @since 4.2
204+
*/
205+
default Function<GetMappingsRequest, Request> getMappingRequest() {
206+
return RequestConverters::getMapping;
207+
}
208208

209209
/**
210210
* @since 4.1

0 commit comments

Comments
 (0)