Skip to content

Fix IllegalArgumentException when creating custom IndicesOption with … #2076

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
Feb 1, 2022
Merged

Fix IllegalArgumentException when creating custom IndicesOption with … #2076

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
7 changes: 6 additions & 1 deletion 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 @@ -118,6 +118,7 @@
* @author Farid Faoudi
* @author Peer Mueller
* @author Sijia Liu
* @author Peter Nowak
* @since 4.0
*/
class RequestFactory {
Expand Down Expand Up @@ -1248,7 +1249,11 @@ public org.elasticsearch.action.support.IndicesOptions toElasticsearchIndicesOpt
.map(it -> org.elasticsearch.action.support.IndicesOptions.WildcardStates.valueOf(it.name().toUpperCase()))
.collect(Collectors.toSet());

return new org.elasticsearch.action.support.IndicesOptions(EnumSet.copyOf(options), EnumSet.copyOf(wildcardStates));
return new org.elasticsearch.action.support.IndicesOptions(
options.isEmpty() ? EnumSet.noneOf(org.elasticsearch.action.support.IndicesOptions.Option.class)
: EnumSet.copyOf(options),
wildcardStates.isEmpty() ? EnumSet.noneOf(org.elasticsearch.action.support.IndicesOptions.WildcardStates.class)
: EnumSet.copyOf(wildcardStates));
}
// endregion

Expand Down
16 changes: 16 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 @@ -22,6 +22,7 @@
import java.io.IOException;
import java.time.Duration;
import java.util.Arrays;
import java.util.EnumSet;
import java.util.HashSet;

import org.elasticsearch.action.DocWriteRequest;
Expand Down Expand Up @@ -70,6 +71,7 @@
* @author Peer Mueller
* @author vdisk
* @author Sijia Liu
* @author Peter Nowak
*/
@SuppressWarnings("ConstantConditions")
@ExtendWith(MockitoExtension.class)
Expand Down Expand Up @@ -628,6 +630,20 @@ void shouldAllowSourceQueryForReindexWithoutRemote() throws IOException, JSONExc
assertEquals(expected, json, false);
}

@Test // #2075
@DisplayName("should not fail on empty Option set during toElasticsearchIndicesOptions")
void shouldNotFailOnEmptyOptionsOnToElasticsearchIndicesOptions() {
assertThat(requestFactory.toElasticsearchIndicesOptions(new IndicesOptions(
EnumSet.noneOf(IndicesOptions.Option.class), EnumSet.of(IndicesOptions.WildcardStates.OPEN)))).isNotNull();
}

@Test // #2075
@DisplayName("should not fail on empty WildcardState set during toElasticsearchIndicesOptions")
void shouldNotFailOnEmptyWildcardStatesOnToElasticsearchIndicesOptions() {
assertThat(requestFactory.toElasticsearchIndicesOptions(IndicesOptions.STRICT_SINGLE_INDEX_NO_EXPAND_FORBID_CLOSED))
.isNotNull();
}

// region entities
static class Person {
@Nullable
Expand Down