Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-16 09:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prefer config supplied content-type and accept header.

Browse Source 
Original Pull Request #2328
Closes #2327
This commit is contained in:
Peter-Josef Meisch 2022-10-08 15:10:26 +02:00 committed by GitHub
parent 8bb3474c05
commit 02b6d54cc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/org/springframework/data/elasticsearch/client/reactive/WebClientProvider.java
View File

@ -256,6 +256,15 @@ public interface WebClientProvider {
HttpHeaders suppliedHeaders = clientConfiguration.getHeadersSupplier().get(); HttpHeaders suppliedHeaders = clientConfiguration.getHeadersSupplier().get();
if (suppliedHeaders != null && suppliedHeaders != HttpHeaders.EMPTY) { 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); httpHeaders.addAll(suppliedHeaders);
} }
})); }));