DATAES-678 - Introduce ReactiveIndexOperations.

Original PR: spring-projects#481

Author: sothawo

src/main/asciidoc/reference/elasticsearch-migration-guide-4.0-4.1.adoc

@@ -3,16 +3,31 @@
 
 This section describes breaking changes from version 4.0.x to 4.1.x and how removed features can be replaced by new introduced features.
 
+[[elasticsearch-migration-guide-4.0-4.1.deprecations]]
 == Deprecations
 
 .Definition of the id property
-It is possible to define a property of en entity as the id property by naming it either `id` or  `document`. This behaviour is now deprecated and  will produce a warning. PLease us the `@Id` annotation to mark a property as being the id property.
+It is possible to define a property of en entity as the id property by naming it either `id` or  `document`.
+This behaviour is now deprecated and will produce a warning.
+PLease us the `@Id` annotation to mark a property as being the id property.
+
+In the `ReactiveElasticsearchClient.Indices` interface the `updateMapping` methods are deprecated in favour of the `putMapping` methods.
+They do the same, but `putMapping` is consistent with the naming in the Elasticsearch API:
 
 [[elasticsearch-migration-guide-4.0-4.1.removal]]
 == Removals
 
 .Type mappings
-The _type mappings_ parameters of the `@Document` annotation and the `IndexCoordinates` object were removed. They had been deprecated in Spring Data Elasticsearch 4.0 and their values weren't used anymore.
+The _type mappings_ parameters of the `@Document` annotation and the `IndexCoordinates` object were removed.
+They had been deprecated in Spring Data Elasticsearch 4.0 and their values weren't used anymore.
+
+[[elasticsearch-migration-guide-4.0-4.1.breaking-changes]]
+== Breaking Changes
+
+=== Return types of ReactiveElasticsearchClient.Indices methods
 
-=== Breaking changes
+The methods in the `ReactiveElasticsearchClient.Indices` were not used up to now.
+With the introduction of the `ReactiveIndexOperations` it became necessary to change some of the return types:
 
+* the `createIndex`  variants now return a `Mono<Boolean>` instead of a `Mono<Void>` to signal successful index creation.
+* the `updateMapping`  variants now return a `Mono<Boolean>` instead of a `Mono<Void>` to signal successful mappings storage.

src/main/java/org/springframework/data/elasticsearch/UncategorizedElasticsearchException.java

@@ -23,6 +23,10 @@
  */
 public class UncategorizedElasticsearchException extends UncategorizedDataAccessException {
 
+	public UncategorizedElasticsearchException(String msg) {
+		super(msg, null);
+	}
+
 	public UncategorizedElasticsearchException(String msg, Throwable cause) {
 		super(msg, cause);
 	}

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

@@ -55,10 +55,14 @@
 import org.elasticsearch.action.admin.indices.flush.FlushRequest;
 import org.elasticsearch.action.admin.indices.flush.FlushResponse;
 import org.elasticsearch.action.admin.indices.get.GetIndexRequest;
+import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsRequest;
+import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponse;
 import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest;
 import org.elasticsearch.action.admin.indices.open.OpenIndexRequest;
 import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
 import org.elasticsearch.action.admin.indices.refresh.RefreshResponse;
+import org.elasticsearch.action.admin.indices.settings.get.GetSettingsRequest;
+import org.elasticsearch.action.admin.indices.settings.get.GetSettingsResponse;
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.delete.DeleteRequest;
@@ -551,26 +555,20 @@ public Mono<Boolean> existsIndex(HttpHeaders headers, GetIndexRequest request) {
 				.next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient.Indices#deleteIndex(org.springframework.http.HttpHeaders, org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest)
-	 */
 	@Override
-	public Mono<Void> deleteIndex(HttpHeaders headers, DeleteIndexRequest request) {
+	public Mono<Boolean> deleteIndex(HttpHeaders headers, DeleteIndexRequest request) {
 
 		return sendRequest(request, requestCreator.indexDelete(), AcknowledgedResponse.class, headers) //
-				.then();
+				.map(AcknowledgedResponse::isAcknowledged) //
+				.next();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient.Indices#createIndex(org.springframework.http.HttpHeaders, org.elasticsearch.action.admin.indices.create.CreateIndexRequest)
-	 */
 	@Override
-	public Mono<Void> createIndex(HttpHeaders headers, CreateIndexRequest createIndexRequest) {
+	public Mono<Boolean> createIndex(HttpHeaders headers, CreateIndexRequest createIndexRequest) {
 
 		return sendRequest(createIndexRequest, requestCreator.indexCreate(), AcknowledgedResponse.class, headers) //
-				.then();
+				.map(AcknowledgedResponse::isAcknowledged) //
+				.next();
 	}
 
 	/*
@@ -606,15 +604,12 @@ public Mono<Void> refreshIndex(HttpHeaders headers, RefreshRequest refreshReques
 				.then();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient.Indices#updateMapping(org.springframework.http.HttpHeaders, org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequest)
-	 */
 	@Override
-	public Mono<Void> updateMapping(HttpHeaders headers, PutMappingRequest putMappingRequest) {
+	public Mono<Boolean> putMapping(HttpHeaders headers, PutMappingRequest putMappingRequest) {
 
 		return sendRequest(putMappingRequest, requestCreator.putMapping(), AcknowledgedResponse.class, headers) //
-				.then();
+				.map(AcknowledgedResponse::isAcknowledged) //
+				.next();
 	}
 
 	/*
@@ -628,6 +623,16 @@ public Mono<Void> flushIndex(HttpHeaders headers, FlushRequest flushRequest) {
 				.then();
 	}
 
+	@Override
+	public Mono<GetMappingsResponse> getMapping(HttpHeaders headers, GetMappingsRequest getMappingsRequest) {
+		return sendRequest(getMappingsRequest, requestCreator.getMapping(), GetMappingsResponse.class, headers).next();
+	}
+
+	@Override
+	public Mono<GetSettingsResponse> getSettings(HttpHeaders headers, GetSettingsRequest getSettingsRequest) {
+		return sendRequest(getSettingsRequest, requestCreator.getSettings(), GetSettingsResponse.class, headers).next();
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient#ping(org.springframework.data.elasticsearch.client.reactive.ReactiveElasticsearchClient.ReactiveElasticsearchClientCallback)