From debf04b4996d4bebf67aef36d3927ad55731903c Mon Sep 17 00:00:00 2001 From: Peter-Josef Meisch Date: Wed, 28 Feb 2024 20:58:43 +0100 Subject: [PATCH] Fix setting setting id in bulkrequest. Original Pull Request #2862 Closes #2861 --- .../client/elc/RequestConverter.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java b/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java index 0f690a601..be7ff96ff 100644 --- a/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java +++ b/src/main/java/org/springframework/data/elasticsearch/client/elc/RequestConverter.java @@ -546,13 +546,12 @@ class RequestConverter { Object queryObject = query.getObject(); if (queryObject != null) { - String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject); - builder // - .id(id) // + builder + .id(StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject)) .document(elasticsearchConverter.mapObject(queryObject)); } else if (query.getSource() != null) { - builder // - .id(query.getId()) // + builder + .id(query.getId()) .document(new DefaultStringObjectMap<>().fromJson(query.getSource())); } else { throw new InvalidDataAccessApiUsageException( @@ -598,12 +597,13 @@ class RequestConverter { Object queryObject = query.getObject(); if (queryObject != null) { - String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject); - builder // - .id(id) // + builder + .id(StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject)) .document(elasticsearchConverter.mapObject(queryObject)); } else if (query.getSource() != null) { - builder.document(new DefaultStringObjectMap<>().fromJson(query.getSource())); + builder + .id(query.getId()) + .document(new DefaultStringObjectMap<>().fromJson(query.getSource())); } else { throw new InvalidDataAccessApiUsageException( "object or source is null, failed to index the document [id: " + query.getId() + ']'); @@ -639,12 +639,13 @@ class RequestConverter { Object queryObject = query.getObject(); if (queryObject != null) { - String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject); - builder // - .id(id) // + builder + .id(StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject)) .document(elasticsearchConverter.mapObject(queryObject)); } else if (query.getSource() != null) { - builder.document(new DefaultStringObjectMap<>().fromJson(query.getSource())); + builder + .id(query.getId()) + .document(new DefaultStringObjectMap<>().fromJson(query.getSource())); } else { throw new InvalidDataAccessApiUsageException( "object or source is null, failed to index the document [id: " + query.getId() + ']');