honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve error message when index settings are not a map (#45588) 

This commit adds an explicit error message when a create index request
contains a settings key that is not a json object. Prior to this change
the user would be given a ClassCastException with no explanation of what
went wrong.

closes #45126
This commit is contained in:
Ryan Ernst 2019-08-16 11:39:03 -07:00 committed by Ryan Ernst
parent 50c65d05ba
commit 742213d710
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java
View File

@ -402,6 +402,9 @@ public class CreateIndexRequest extends AcknowledgedRequest<CreateIndexRequest>
for (Map.Entry<String, ?> entry : source.entrySet()) { for (Map.Entry<String, ?> entry : source.entrySet()) {
String name = entry.getKey(); String name = entry.getKey();
if (SETTINGS.match(name, deprecationHandler)) { if (SETTINGS.match(name, deprecationHandler)) {
if (entry.getValue() instanceof Map == false) {
throw new ElasticsearchParseException("key [settings] must be an object");
}
settings((Map<String, Object>) entry.getValue()); settings((Map<String, Object>) entry.getValue());
} else if (MAPPINGS.match(name, deprecationHandler)) { } else if (MAPPINGS.match(name, deprecationHandler)) {
Map<String, Object> mappings = (Map<String, Object>) entry.getValue(); Map<String, Object> mappings = (Map<String, Object>) entry.getValue();

10
server/src/test/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequestTests.java
View File

@ -44,6 +44,7 @@ import java.util.Set;
import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS; import static org.elasticsearch.cluster.metadata.IndexMetaData.SETTING_NUMBER_OF_SHARDS;
import static org.elasticsearch.common.xcontent.ToXContent.EMPTY_PARAMS; import static org.elasticsearch.common.xcontent.ToXContent.EMPTY_PARAMS;
import static org.hamcrest.CoreMatchers.equalTo;
public class CreateIndexRequestTests extends ESTestCase { public class CreateIndexRequestTests extends ESTestCase {
@ -196,6 +197,15 @@ public class CreateIndexRequestTests extends ESTestCase {
ElasticsearchAssertions.assertToXContentEquivalent(originalBytes, finalBytes, xContentType); ElasticsearchAssertions.assertToXContentEquivalent(originalBytes, finalBytes, xContentType);
} }
public void testSettingsType() throws IOException {
XContentBuilder builder = XContentFactory.contentBuilder(randomFrom(XContentType.values()));
builder.startObject().startArray("settings").endArray().endObject();
CreateIndexRequest parsedCreateIndexRequest = new CreateIndexRequest();
ElasticsearchParseException e = expectThrows(ElasticsearchParseException.class, () -> parsedCreateIndexRequest.source(builder));
assertThat(e.getMessage(), equalTo("key [settings] must be an object"));
}
public static void assertMappingsEqual(Map<String, String> expected, Map<String, String> actual) throws IOException { public static void assertMappingsEqual(Map<String, String> expected, Map<String, String> actual) throws IOException {
assertEquals(expected.keySet(), actual.keySet()); assertEquals(expected.keySet(), actual.keySet());