Fix NPE on IndexQuery with source and version.

Original Pull Request #1894
Closes #1893

(cherry picked from commit 36b449c)

Author: sothawo

Diff for: src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java

@@ -760,15 +760,17 @@ public IndexRequest indexRequest(IndexQuery query, IndexCoordinates index) {
 		String indexName = index.getIndexName();
 		IndexRequest indexRequest;
 
-		if (query.getObject() != null) {
-			String id = StringUtils.isEmpty(query.getId()) ? getPersistentEntityId(query.getObject()) : query.getId();
+		Object queryObject = query.getObject();
+
+		if (queryObject != null) {
+			String id = StringUtils.isEmpty(query.getId()) ? getPersistentEntityId(queryObject) : query.getId();
 			// If we have a query id and a document id, do not ask ES to generate one.
 			if (id != null) {
 				indexRequest = new IndexRequest(indexName).id(id);
 			} else {
 				indexRequest = new IndexRequest(indexName);
 			}
-			indexRequest.source(elasticsearchConverter.mapObject(query.getObject()).toJson(), Requests.INDEX_CONTENT_TYPE);
+			indexRequest.source(elasticsearchConverter.mapObject(queryObject).toJson(), Requests.INDEX_CONTENT_TYPE);
 		} else if (query.getSource() != null) {
 			indexRequest = new IndexRequest(indexName).id(query.getId()).source(query.getSource(),
 					Requests.INDEX_CONTENT_TYPE);
@@ -779,7 +781,8 @@ public IndexRequest indexRequest(IndexQuery query, IndexCoordinates index) {
 
 		if (query.getVersion() != null) {
 			indexRequest.version(query.getVersion());
-			VersionType versionType = retrieveVersionTypeFromPersistentEntity(query.getObject().getClass());
+			VersionType versionType = retrieveVersionTypeFromPersistentEntity(
+					queryObject != null ? queryObject.getClass() : null);
 			indexRequest.versionType(versionType);
 		}
 
@@ -814,15 +817,16 @@ public IndexRequestBuilder indexRequestBuilder(Client client, IndexQuery query,
 
 		IndexRequestBuilder indexRequestBuilder;
 
-		if (query.getObject() != null) {
-			String id = StringUtils.isEmpty(query.getId()) ? getPersistentEntityId(query.getObject()) : query.getId();
+		Object queryObject = query.getObject();
+		if (queryObject != null) {
+			String id = StringUtils.isEmpty(query.getId()) ? getPersistentEntityId(queryObject) : query.getId();
 			// If we have a query id and a document id, do not ask ES to generate one.
 			if (id != null) {
 				indexRequestBuilder = client.prepareIndex(indexName, type, id);
 			} else {
 				indexRequestBuilder = client.prepareIndex(indexName, type);
 			}
-			indexRequestBuilder.setSource(elasticsearchConverter.mapObject(query.getObject()).toJson(),
+			indexRequestBuilder.setSource(elasticsearchConverter.mapObject(queryObject).toJson(),
 					Requests.INDEX_CONTENT_TYPE);
 		} else if (query.getSource() != null) {
 			indexRequestBuilder = client.prepareIndex(indexName, type, query.getId()).setSource(query.getSource(),
@@ -834,7 +838,8 @@ public IndexRequestBuilder indexRequestBuilder(Client client, IndexQuery query,
 
 		if (query.getVersion() != null) {
 			indexRequestBuilder.setVersion(query.getVersion());
-			VersionType versionType = retrieveVersionTypeFromPersistentEntity(query.getObject().getClass());
+			VersionType versionType = retrieveVersionTypeFromPersistentEntity(
+					queryObject != null ? queryObject.getClass() : null);
 			indexRequestBuilder.setVersionType(versionType);
 		}
 
@@ -1695,12 +1700,13 @@ private String getPersistentEntityId(Object entity) {
 		return null;
 	}
 
-	private VersionType retrieveVersionTypeFromPersistentEntity(Class<?> clazz) {
+	private VersionType retrieveVersionTypeFromPersistentEntity(@Nullable Class<?> clazz) {
 
 		MappingContext<? extends ElasticsearchPersistentEntity<?>, ElasticsearchPersistentProperty> mappingContext = elasticsearchConverter
 				.getMappingContext();
 
-		ElasticsearchPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(clazz);
+		ElasticsearchPersistentEntity<?> persistentEntity = clazz != null ? mappingContext.getPersistentEntity(clazz)
+				: null;
 
 		VersionType versionType = null;
 

Diff for: src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java

@@ -1129,7 +1129,8 @@ void shouldUsePageableOnMoreLikeThisQueries() {
 		Collection<String> ids = IntStream.rangeClosed(1, 10).mapToObj(i -> nextIdAsString()).collect(Collectors.toList());
 		ids.add(referenceId);
 		ids.stream()
-				.map(id -> getIndexQuery(SampleEntity.builder().id(id).message(sampleMessage).version(System.currentTimeMillis()).build()))
+				.map(id -> getIndexQuery(
+						SampleEntity.builder().id(id).message(sampleMessage).version(System.currentTimeMillis()).build()))
 				.forEach(indexQuery -> operations.index(indexQuery, index));
 		indexOperations.refresh();
 
@@ -1144,7 +1145,8 @@ void shouldUsePageableOnMoreLikeThisQueries() {
 		assertThat(searchHits.getTotalHits()).isEqualTo(10);
 		assertThat(searchHits.getSearchHits()).hasSize(5);
 
-		Collection<String> returnedIds = searchHits.getSearchHits().stream().map(SearchHit::getId).collect(Collectors.toList());
+		Collection<String> returnedIds = searchHits.getSearchHits().stream().map(SearchHit::getId)
+				.collect(Collectors.toList());
 
 		moreLikeThisQuery.setPageable(PageRequest.of(1, 5));
 
@@ -3794,6 +3796,22 @@ void shouldReturnExplanationWhenRequested() {
 		assertThat(explanation).isNotNull();
 	}
 
+	@Test // #1893
+	@DisplayName("should index document from source with version")
+	void shouldIndexDocumentFromSourceWithVersion() {
+
+		String source = "{\n" + //
+				"  \"answer\": 42\n" + //
+				"}";
+		IndexQuery query = new IndexQueryBuilder() //
+				.withId("42") //
+				.withSource(source) //
+				.withVersion(42L) //
+				.build();
+
+		operations.index(query, IndexCoordinates.of(INDEX_NAME_SAMPLE_ENTITY));
+	}
+
 	// region entities
 	@Document(indexName = INDEX_NAME_SAMPLE_ENTITY)
 	@Setting(shards = 1, replicas = 0, refreshInterval = "-1")
@@ -4572,5 +4590,5 @@ public void setText(@Nullable String text) {
 			this.text = text;
 		}
 	}
-	//endregion
+	// endregion
 }