Skip to content

Fix NPE in RequestFactory when language in UpdateQuery is not set (4.4.x) #2288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2022
Merged

Fix NPE in RequestFactory when language in UpdateQuery is not set (4.4.x) #2288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/main/java/org/springframework/data/elasticsearch/core/RequestFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ public IndexRequest indexRequest(IndexQuery query, IndexCoordinates index) {
Object queryObject = query.getObject();

if (queryObject != null) {
String id = StringUtils.isEmpty(query.getId()) ? getPersistentEntityId(queryObject) : query.getId();
String id = StringUtils.hasText(query.getId()) ? query.getId() : getPersistentEntityId(queryObject);
// 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);
Expand Down Expand Up @@ -1027,7 +1027,14 @@ public UpdateRequest updateRequest(UpdateQuery query, IndexCoordinates index) {
if (params == null) {
params = new HashMap<>();
}
Script script = new Script(getScriptType(query.getScriptType()), query.getLang(), query.getScript(), params);
org.elasticsearch.script.ScriptType scriptType = getScriptType(query.getScriptType());
String lang = query.getLang();

if (scriptType == org.elasticsearch.script.ScriptType.INLINE && lang == null) {
lang = "painless";
}

Script script = new Script(scriptType, lang, query.getScript(), params);
updateRequest.script(script);
}

Expand Down
12 changes: 12 additions & 0 deletions src/test/java/org/springframework/data/elasticsearch/core/RequestFactoryTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,18 @@ public void shouldUseUpsertOnUpdate() {
assertThat(request.upsertRequest()).isNotNull();
}

@Test // #2287
@DisplayName("should create update query when script language is not set")
void shouldCreateUpdateQueryWhenScriptTypeIsSetToNull() {

UpdateQuery updateQuery = UpdateQuery.builder("1") //
.withScript("script").build();

UpdateRequest request = requestFactory.updateRequest(updateQuery, IndexCoordinates.of("index"));

assertThat(request).isNotNull();
}

@Test // DATAES-693
public void shouldReturnSourceWhenRequested() {
// given
Expand Down