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

Fix NPE on IndexQuery with source and version.

Browse Source 
Original Pull Request #1894
Closes #1893

(cherry picked from commit 36b449c3852fee3b4cdeb0760058c4265d8a176c)
This commit is contained in:
Peter-Josef Meisch 2021-08-06 20:01:02 +02:00
parent d371404f90
commit c0781efbaa
No known key found for this signature in database
GPG Key ID: DE108246970C7708
2 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java
View File

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

24
src/test/java/org/springframework/data/elasticsearch/core/ElasticsearchTemplateTests.java
View File

@ -1129,7 +1129,8 @@ public abstract class ElasticsearchTemplateTests {
Collection<String> ids = IntStream.rangeClosed(1, 10).mapToObj(i -> nextIdAsString()).collect(Collectors.toList()); Collection<String> ids = IntStream.rangeClosed(1, 10).mapToObj(i -> nextIdAsString()).collect(Collectors.toList());
ids.add(referenceId); ids.add(referenceId);
ids.stream() 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)); .forEach(indexQuery -> operations.index(indexQuery, index));
indexOperations.refresh(); indexOperations.refresh();
@ -1144,7 +1145,8 @@ public abstract class ElasticsearchTemplateTests {
assertThat(searchHits.getTotalHits()).isEqualTo(10); assertThat(searchHits.getTotalHits()).isEqualTo(10);
assertThat(searchHits.getSearchHits()).hasSize(5); 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)); moreLikeThisQuery.setPageable(PageRequest.of(1, 5));
@ -3794,6 +3796,22 @@ public abstract class ElasticsearchTemplateTests {
assertThat(explanation).isNotNull(); 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 // region entities
@Document(indexName = INDEX_NAME_SAMPLE_ENTITY) @Document(indexName = INDEX_NAME_SAMPLE_ENTITY)
@Setting(shards = 1, replicas = 0, refreshInterval = "-1") @Setting(shards = 1, replicas = 0, refreshInterval = "-1")
@ -4572,5 +4590,5 @@ public abstract class ElasticsearchTemplateTests {
this.text = text; this.text = text;
} }
} }
//endregion // endregion
} }