IndexQuery's id get ignored in bulkIndexOperation.

Original Pull Request #2407
Closdes #2405

(cherry picked from commit 4d7d095)

Author: scoobyzhang

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

@@ -132,6 +132,7 @@
  * @author Peter-Josef Meisch
  * @author Sascha Woo
  * @author cdalxndr
+ * @author scoobyzhang
  * @since 4.4
  */
 class RequestConverter {
@@ -476,7 +477,7 @@ public IndexRequest<?> documentIndexRequest(IndexQuery query, IndexCoordinates i
 		Object queryObject = query.getObject();
 
 		if (queryObject != null) {
-			String id = !StringUtils.hasText(query.getId()) ? getPersistentEntityId(queryObject) : query.getId();
+			String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject);
 			builder //
 					.id(id) //
 					.document(elasticsearchConverter.mapObject(queryObject));
@@ -528,7 +529,7 @@ private IndexOperation<?> bulkIndexOperation(IndexQuery query, IndexCoordinates
 		Object queryObject = query.getObject();
 
 		if (queryObject != null) {
-			String id = StringUtils.hasText(query.getId()) ? getPersistentEntityId(queryObject) : query.getId();
+			String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject);
 			builder //
 					.id(id) //
 					.document(elasticsearchConverter.mapObject(queryObject));
@@ -569,7 +570,7 @@ private CreateOperation<?> bulkCreateOperation(IndexQuery query, IndexCoordinate
 		Object queryObject = query.getObject();
 
 		if (queryObject != null) {
-			String id = StringUtils.hasText(query.getId()) ? getPersistentEntityId(queryObject) : query.getId();
+			String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject);
 			builder //
 					.id(id) //
 					.document(elasticsearchConverter.mapObject(queryObject));

src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchIntegrationTests.java

@@ -128,6 +128,7 @@
  * @author Peer Mueller
  * @author Sijia Liu
  * @author Haibo Liu
+ * @author scoobyzhang
  */
 @SpringIntegrationTest
 public abstract class ElasticsearchIntegrationTests {
@@ -215,6 +216,26 @@ public void shouldThrowDataAccessExceptionIfDocumentDoesNotExistWhileDoingPartia
 		assertThatThrownBy(() -> operations.update(sampleEntity)).isInstanceOf(DataAccessException.class);
 	}
 
+	@Test // #2405
+	public void shouldNotIgnoreIdFromIndexQuery() {
+		String indexName = indexNameProvider.indexName();
+		IndexCoordinates indexCoordinates = IndexCoordinates.of(indexName);
+
+		SampleEntity object1 = SampleEntity.builder().id("objectId1").message("objectMessage1").build();
+		SampleEntity object2 = SampleEntity.builder().id("objectId2").message("objectMessage2").build();
+		List<IndexQuery> indexQueries = Arrays.asList(
+				new IndexQueryBuilder().withIndex(indexName).withId("idFromQuery1").withObject(object1)
+						.withOpType(IndexQuery.OpType.INDEX).build(),
+				new IndexQueryBuilder().withIndex(indexName).withId("idFromQuery2").withObject(object2)
+						.withOpType(IndexQuery.OpType.CREATE).build());
+		operations.bulkIndex(indexQueries, indexCoordinates);
+
+		boolean foundObject1 = operations.exists("idFromQuery1", indexCoordinates);
+		assertThat(foundObject1).isTrue();
+		boolean foundObject2 = operations.exists("idFromQuery2", indexCoordinates);
+		assertThat(foundObject2).isTrue();
+	}
+
 	@Test
 	public void shouldThrowDataAccessExceptionIfDocumentDoesNotExistWhileDoingPartialUpdate() {