Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-29 07:12:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix setting setting id in bulkrequest.

Browse Source 
Original Pull Request #2862
Closes #2861

(cherry picked from commit debf04b4996d4bebf67aef36d3927ad55731903c)
(cherry picked from commit b52e8d1431d6048f257f51924c648f2e57804663)
This commit is contained in:
Peter-Josef Meisch 2024-02-28 20:58:43 +01:00
parent a952e1044a
commit e105648631
No known key found for this signature in database
GPG Key ID: DE108246970C7708
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java
View File

@ -539,13 +539,12 @@ class RequestConverter {
Object queryObject = query.getObject(); Object queryObject = query.getObject();
if (queryObject != null) { if (queryObject != null) {
String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject); builder
builder // .id(StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject))
.id(id) //
.document(elasticsearchConverter.mapObject(queryObject)); .document(elasticsearchConverter.mapObject(queryObject));
} else if (query.getSource() != null) { } else if (query.getSource() != null) {
builder // builder
.id(query.getId()) // .id(query.getId())
.document(new DefaultStringObjectMap<>().fromJson(query.getSource())); .document(new DefaultStringObjectMap<>().fromJson(query.getSource()));
} else { } else {
throw new InvalidDataAccessApiUsageException( throw new InvalidDataAccessApiUsageException(
@ -591,12 +590,13 @@ class RequestConverter {
Object queryObject = query.getObject(); Object queryObject = query.getObject();
if (queryObject != null) { if (queryObject != null) {
String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject); builder
builder // .id(StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject))
.id(id) //
.document(elasticsearchConverter.mapObject(queryObject)); .document(elasticsearchConverter.mapObject(queryObject));
} else if (query.getSource() != null) { } else if (query.getSource() != null) {
builder.document(new DefaultStringObjectMap<>().fromJson(query.getSource())); builder
.id(query.getId())
.document(new DefaultStringObjectMap<>().fromJson(query.getSource()));
} else { } else {
throw new InvalidDataAccessApiUsageException( throw new InvalidDataAccessApiUsageException(
"object or source is null, failed to index the document [id: " + query.getId() + ']'); "object or source is null, failed to index the document [id: " + query.getId() + ']');
@ -632,12 +632,13 @@ class RequestConverter {
Object queryObject = query.getObject(); Object queryObject = query.getObject();
if (queryObject != null) { if (queryObject != null) {
String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject); builder
builder // .id(StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject))
.id(id) //
.document(elasticsearchConverter.mapObject(queryObject)); .document(elasticsearchConverter.mapObject(queryObject));
} else if (query.getSource() != null) { } else if (query.getSource() != null) {
builder.document(new DefaultStringObjectMap<>().fromJson(query.getSource())); builder
.id(query.getId())
.document(new DefaultStringObjectMap<>().fromJson(query.getSource()));
} else { } else {
throw new InvalidDataAccessApiUsageException( throw new InvalidDataAccessApiUsageException(
"object or source is null, failed to index the document [id: " + query.getId() + ']'); "object or source is null, failed to index the document [id: " + query.getId() + ']');