mirror of
https://github.com/spring-projects/spring-data-elasticsearch.git
synced 2025-06-01 09:42:11 +00:00
Polishing
This commit is contained in:
parent
3bc01a4e5f
commit
17a25cb0ad
@ -79,18 +79,7 @@ import org.elasticsearch.action.update.UpdateRequest;
|
|||||||
import org.elasticsearch.action.update.UpdateResponse;
|
import org.elasticsearch.action.update.UpdateResponse;
|
||||||
import org.elasticsearch.client.GetAliasesResponse;
|
import org.elasticsearch.client.GetAliasesResponse;
|
||||||
import org.elasticsearch.client.Request;
|
import org.elasticsearch.client.Request;
|
||||||
import org.elasticsearch.client.indices.CreateIndexRequest;
|
import org.elasticsearch.client.indices.*;
|
||||||
import org.elasticsearch.client.indices.GetFieldMappingsRequest;
|
|
||||||
import org.elasticsearch.client.indices.GetFieldMappingsResponse;
|
|
||||||
import org.elasticsearch.client.indices.GetIndexRequest;
|
|
||||||
import org.elasticsearch.client.indices.GetIndexResponse;
|
|
||||||
import org.elasticsearch.client.indices.GetIndexTemplatesRequest;
|
|
||||||
import org.elasticsearch.client.indices.GetIndexTemplatesResponse;
|
|
||||||
import org.elasticsearch.client.indices.GetMappingsRequest;
|
|
||||||
import org.elasticsearch.client.indices.GetMappingsResponse;
|
|
||||||
import org.elasticsearch.client.indices.IndexTemplatesExistRequest;
|
|
||||||
import org.elasticsearch.client.indices.PutIndexTemplateRequest;
|
|
||||||
import org.elasticsearch.client.indices.PutMappingRequest;
|
|
||||||
import org.elasticsearch.common.unit.TimeValue;
|
import org.elasticsearch.common.unit.TimeValue;
|
||||||
import org.elasticsearch.common.xcontent.DeprecationHandler;
|
import org.elasticsearch.common.xcontent.DeprecationHandler;
|
||||||
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
|
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
|
||||||
@ -647,7 +636,7 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
|
|||||||
// region indices operations
|
// region indices operations
|
||||||
@Override
|
@Override
|
||||||
public Mono<Boolean> createIndex(HttpHeaders headers,
|
public Mono<Boolean> createIndex(HttpHeaders headers,
|
||||||
org.elasticsearch.action.admin.indices.create.CreateIndexRequest createIndexRequest) {
|
org.elasticsearch.action.admin.indices.create.CreateIndexRequest createIndexRequest) {
|
||||||
|
|
||||||
return sendRequest(createIndexRequest, requestCreator.indexCreate(), AcknowledgedResponse.class, headers) //
|
return sendRequest(createIndexRequest, requestCreator.indexCreate(), AcknowledgedResponse.class, headers) //
|
||||||
.map(AcknowledgedResponse::isAcknowledged) //
|
.map(AcknowledgedResponse::isAcknowledged) //
|
||||||
@ -670,21 +659,22 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Mono<Boolean> existsIndex(HttpHeaders headers, org.elasticsearch.action.admin.indices.get.GetIndexRequest request) {
|
public Mono<Boolean> existsIndex(HttpHeaders headers,
|
||||||
|
org.elasticsearch.action.admin.indices.get.GetIndexRequest request) {
|
||||||
|
|
||||||
return sendRequest(request, requestCreator.indexExists(), RawActionResponse.class, headers) //
|
return sendRequest(request, requestCreator.indexExists(), RawActionResponse.class, headers) //
|
||||||
.flatMap(response -> response.releaseBody().thenReturn(response.statusCode().is2xxSuccessful())) //
|
.flatMap(response -> response.releaseBody().thenReturn(response.statusCode().is2xxSuccessful())) //
|
||||||
.next();
|
.next();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Mono<Boolean> existsIndex(HttpHeaders headers, GetIndexRequest request) {
|
public Mono<Boolean> existsIndex(HttpHeaders headers, GetIndexRequest request) {
|
||||||
return sendRequest(request, requestCreator.indexExistsRequest(), RawActionResponse.class, headers) //
|
return sendRequest(request, requestCreator.indexExistsRequest(), RawActionResponse.class, headers) //
|
||||||
.flatMap(response -> response.releaseBody().thenReturn(response.statusCode().is2xxSuccessful())) //
|
.flatMap(response -> response.releaseBody().thenReturn(response.statusCode().is2xxSuccessful())) //
|
||||||
.next();
|
.next();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Mono<Boolean> deleteIndex(HttpHeaders headers, DeleteIndexRequest request) {
|
public Mono<Boolean> deleteIndex(HttpHeaders headers, DeleteIndexRequest request) {
|
||||||
|
|
||||||
return sendRequest(request, requestCreator.indexDelete(), AcknowledgedResponse.class, headers) //
|
return sendRequest(request, requestCreator.indexDelete(), AcknowledgedResponse.class, headers) //
|
||||||
@ -701,15 +691,15 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Mono<org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse> getMapping(HttpHeaders headers,
|
public Mono<org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse> getMapping(HttpHeaders headers,
|
||||||
org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest getMappingsRequest) {
|
org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest getMappingsRequest) {
|
||||||
return sendRequest(getMappingsRequest, requestCreator.getMapping(),
|
return sendRequest(getMappingsRequest, requestCreator.getMapping(),
|
||||||
org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse.class, headers).next();
|
org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse.class, headers).next();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Mono<GetMappingsResponse> getMapping(HttpHeaders headers, GetMappingsRequest getMappingsRequest) {
|
public Mono<GetMappingsResponse> getMapping(HttpHeaders headers, GetMappingsRequest getMappingsRequest) {
|
||||||
return sendRequest(getMappingsRequest, requestCreator.getMappingRequest(), GetMappingsResponse.class, headers) //
|
return sendRequest(getMappingsRequest, requestCreator.getMappingRequest(), GetMappingsResponse.class, headers) //
|
||||||
.next();
|
.next();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -726,7 +716,7 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Mono<Boolean> putMapping(HttpHeaders headers,
|
public Mono<Boolean> putMapping(HttpHeaders headers,
|
||||||
org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest putMappingRequest) {
|
org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest putMappingRequest) {
|
||||||
|
|
||||||
return sendRequest(putMappingRequest, requestCreator.putMapping(), AcknowledgedResponse.class, headers) //
|
return sendRequest(putMappingRequest, requestCreator.putMapping(), AcknowledgedResponse.class, headers) //
|
||||||
.map(AcknowledgedResponse::isAcknowledged) //
|
.map(AcknowledgedResponse::isAcknowledged) //
|
||||||
@ -735,9 +725,9 @@ public class DefaultReactiveElasticsearchClient implements ReactiveElasticsearch
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Mono<Boolean> putMapping(HttpHeaders headers, PutMappingRequest putMappingRequest) {
|
public Mono<Boolean> putMapping(HttpHeaders headers, PutMappingRequest putMappingRequest) {
|
||||||
return sendRequest(putMappingRequest, requestCreator.putMappingRequest(), AcknowledgedResponse.class, headers) //
|
return sendRequest(putMappingRequest, requestCreator.putMappingRequest(), AcknowledgedResponse.class, headers) //
|
||||||
.map(AcknowledgedResponse::isAcknowledged) //
|
.map(AcknowledgedResponse::isAcknowledged) //
|
||||||
.next();
|
.next();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -114,36 +114,36 @@ public interface RequestCreator {
|
|||||||
|
|
||||||
// --> INDICES
|
// --> INDICES
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated since 4.2
|
* @deprecated since 4.2
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
default Function<org.elasticsearch.action.admin.indices.get.GetIndexRequest, Request> indexExists() {
|
default Function<org.elasticsearch.action.admin.indices.get.GetIndexRequest, Request> indexExists() {
|
||||||
return RequestConverters::indexExists;
|
return RequestConverters::indexExists;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @since 4.2
|
* @since 4.2
|
||||||
*/
|
*/
|
||||||
default Function<GetIndexRequest, Request> indexExistsRequest() {
|
default Function<GetIndexRequest, Request> indexExistsRequest() {
|
||||||
return RequestConverters::indexExists;
|
return RequestConverters::indexExists;
|
||||||
}
|
}
|
||||||
|
|
||||||
default Function<DeleteIndexRequest, Request> indexDelete() {
|
default Function<DeleteIndexRequest, Request> indexDelete() {
|
||||||
return RequestConverters::indexDelete;
|
return RequestConverters::indexDelete;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated since 4.2
|
* @deprecated since 4.2
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
default Function<org.elasticsearch.action.admin.indices.create.CreateIndexRequest, Request> indexCreate() {
|
default Function<org.elasticsearch.action.admin.indices.create.CreateIndexRequest, Request> indexCreate() {
|
||||||
return RequestConverters::indexCreate;
|
return RequestConverters::indexCreate;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @since 4.2
|
* @since 4.2
|
||||||
*/
|
*/
|
||||||
default Function<CreateIndexRequest, Request> createIndexRequest() {
|
default Function<CreateIndexRequest, Request> createIndexRequest() {
|
||||||
return RequestConverters::indexCreate;
|
return RequestConverters::indexCreate;
|
||||||
}
|
}
|
||||||
@ -160,20 +160,20 @@ public interface RequestCreator {
|
|||||||
return RequestConverters::indexRefresh;
|
return RequestConverters::indexRefresh;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated since 4.2
|
* @deprecated since 4.2
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
default Function<org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest, Request> putMapping() {
|
default Function<org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest, Request> putMapping() {
|
||||||
return RequestConverters::putMapping;
|
return RequestConverters::putMapping;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @since 4.2
|
* @since 4.2
|
||||||
*/
|
*/
|
||||||
default Function<PutMappingRequest, Request> putMappingRequest() {
|
default Function<PutMappingRequest, Request> putMappingRequest() {
|
||||||
return RequestConverters::putMapping;
|
return RequestConverters::putMapping;
|
||||||
}
|
}
|
||||||
|
|
||||||
default Function<FlushRequest, Request> flushIndex() {
|
default Function<FlushRequest, Request> flushIndex() {
|
||||||
return RequestConverters::flushIndex;
|
return RequestConverters::flushIndex;
|
||||||
@ -192,19 +192,19 @@ public interface RequestCreator {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* @since 4.1
|
* @since 4.1
|
||||||
* @deprecated since 4.2
|
* @deprecated since 4.2
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
default Function<org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest, Request> getMapping() {
|
default Function<org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest, Request> getMapping() {
|
||||||
return RequestConverters::getMapping;
|
return RequestConverters::getMapping;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @since 4.2
|
* @since 4.2
|
||||||
*/
|
*/
|
||||||
default Function<GetMappingsRequest, Request> getMappingRequest() {
|
default Function<GetMappingsRequest, Request> getMappingRequest() {
|
||||||
return RequestConverters::getMapping;
|
return RequestConverters::getMapping;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @since 4.1
|
* @since 4.1
|
||||||
|
Loading…
x
Reference in New Issue
Block a user