DATAES-822 - Convert Reactive Server Exceptions to ElasticsearchStatusException.

Author: sothawo

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

@@ -94,7 +94,6 @@
 import org.elasticsearch.search.SearchHits;
 import org.elasticsearch.search.aggregations.Aggregation;
 import org.reactivestreams.Publisher;
-
 import org.springframework.data.elasticsearch.client.ClientConfiguration;
 import org.springframework.data.elasticsearch.client.ClientLogger;
 import org.springframework.data.elasticsearch.client.ElasticsearchHost;
@@ -113,7 +112,6 @@
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.ReflectionUtils;
-import org.springframework.web.client.HttpServerErrorException;
 import org.springframework.web.reactive.function.BodyExtractors;
 import org.springframework.web.reactive.function.client.ClientRequest;
 import org.springframework.web.reactive.function.client.ClientResponse;
@@ -806,9 +804,10 @@ private static XContentParser createParser(String mediaType, String content) thr
 
 	private <T> Publisher<? extends T> handleServerError(Request request, ClientResponse response) {
 
-		return Mono.error(
-				new HttpServerErrorException(response.statusCode(), String.format("%s request to %s returned error code %s.",
-						request.getMethod(), request.getEndpoint(), response.statusCode().value())));
+		RestStatus status = RestStatus.fromCode(response.statusCode().value());
+
+		return Mono.error(new ElasticsearchStatusException(String.format("%s request to %s returned error code %s.",
+				request.getMethod(), request.getEndpoint(), response.statusCode().value()), status));
 	}
 
 	private <T> Publisher<? extends T> handleClientError(String logId, Request request, ClientResponse response,
@@ -828,8 +827,7 @@ private <T> Publisher<? extends T> handleClientError(String logId, Request reque
 							return Mono.error(new ElasticsearchStatusException(sb.toString(), status, exception));
 						}
 					} catch (Exception e) {
-						return Mono
-								.error(new ElasticsearchStatusException(content, status));
+						return Mono.error(new ElasticsearchStatusException(content, status));
 					}
 					return Mono.just(content);
 				}).doOnNext(it -> ClientLogger.logResponse(logId, response.statusCode(), it)) //