Fix setting setting id in bulkrequest.

Original Pull Request #2862
Closes #2861

(cherry picked from commit debf04b)

Author: sothawo

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

@@ -545,13 +545,12 @@ public IndexRequest<?> documentIndexRequest(IndexQuery query, IndexCoordinates i
 		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(
@@ -597,12 +596,13 @@ private IndexOperation<?> bulkIndexOperation(IndexQuery query, IndexCoordinates
 		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() + ']');
@@ -638,12 +638,13 @@ private CreateOperation<?> bulkCreateOperation(IndexQuery query, IndexCoordinate
 		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() + ']');