diff --git a/src/main/java/org/springframework/data/elasticsearch/client/reactive/WebClientProvider.java b/src/main/java/org/springframework/data/elasticsearch/client/reactive/WebClientProvider.java index 4f448b3c3..1252f00e4 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/reactive/WebClientProvider.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/reactive/WebClientProvider.java @@ -256,6 +256,15 @@ public interface WebClientProvider { HttpHeaders suppliedHeaders = clientConfiguration.getHeadersSupplier().get(); if (suppliedHeaders != null && suppliedHeaders != HttpHeaders.EMPTY) { + + // remove content-type and accept if they are provided by the client configuration (ES7 compatibility headers) + if (suppliedHeaders.containsKey(HttpHeaders.CONTENT_TYPE)) { + httpHeaders.remove(HttpHeaders.CONTENT_TYPE); + } + if (suppliedHeaders.containsKey(HttpHeaders.ACCEPT)) { + httpHeaders.remove(HttpHeaders.ACCEPT); + } + httpHeaders.addAll(suppliedHeaders); } }));