summaryrefslogtreecommitdiff
path: root/core/src/main/java/org/elasticsearch
diff options
context:
space:
mode:
authorTal Levy <JubBoy333@gmail.com>2017-06-27 08:55:24 -0700
committerGitHub <noreply@github.com>2017-06-27 08:55:24 -0700
commitcbcf6a4f55c2de7085a9ad04fff2f38d8b1553e4 (patch)
tree81d55340d1fa782280cc68aec20b2409dc2d08ca /core/src/main/java/org/elasticsearch
parentc85ac402b01ec06b3f41e8245ed5acd59e95a1e6 (diff)
correct expected thrown exception in mappingMetaData to ElasticsearchParseException (#25410)
Diffstat (limited to 'core/src/main/java/org/elasticsearch')
-rw-r--r--core/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java b/core/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
index 1f6aeb1122..83a06d9c4c 100644
--- a/core/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
+++ b/core/src/main/java/org/elasticsearch/cluster/metadata/MappingMetaData.java
@@ -19,6 +19,7 @@
package org.elasticsearch.cluster.metadata;
+import org.elasticsearch.ElasticsearchParseException;
import org.elasticsearch.Version;
import org.elasticsearch.cluster.AbstractDiffable;
import org.elasticsearch.cluster.Diff;
@@ -170,7 +171,7 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> {
/**
* Converts the serialized compressed form of the mappings into a parsed map.
*/
- public Map<String, Object> sourceAsMap() throws IOException {
+ public Map<String, Object> sourceAsMap() throws ElasticsearchParseException {
Map<String, Object> mapping = XContentHelper.convertToMap(source.compressedReference(), true).v2();
if (mapping.size() == 1 && mapping.containsKey(type())) {
// the type name is the root value, reduce it
@@ -182,7 +183,7 @@ public class MappingMetaData extends AbstractDiffable<MappingMetaData> {
/**
* Converts the serialized compressed form of the mappings into a parsed map.
*/
- public Map<String, Object> getSourceAsMap() throws IOException {
+ public Map<String, Object> getSourceAsMap() throws ElasticsearchParseException {
return sourceAsMap();
}