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

Throw ParsingExceptions instead of IllegalArgument 

... keeps track of the position of the error.
This commit is contained in:
Isabel Drost-Fromm 2016-03-14 14:00:58 +01:00
parent fb647e9bf4
commit 744de1f6cb
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/elasticsearch/search/sort/FieldSortBuilder.java
View File

@ -21,6 +21,7 @@ package org.elasticsearch.search.sort;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.common.ParseField;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.io.stream.StreamInput;
import org.elasticsearch.common.io.stream.StreamOutput;
import org.elasticsearch.common.lucene.BytesRefs;
@ -305,7 +306,7 @@ public class FieldSortBuilder extends SortBuilder<FieldSortBuilder> implements S
if (context.parseFieldMatcher().match(currentFieldName, NESTED_FILTER)) {
nestedFilter = context.parseInnerQueryBuilder();
} else {
throw new IllegalArgumentException("Expected " + NESTED_FILTER.getPreferredName() + " element.");
throw new ParsingException(parser.getTokenLocation(), "Expected " + NESTED_FILTER.getPreferredName() + " element.");
}
} else if (token.isValue()) {
if (context.parseFieldMatcher().match(currentFieldName, NESTED_PATH)) {

3
core/src/test/java/org/elasticsearch/search/sort/AbstractSortTestCase.java
View File

@ -19,6 +19,7 @@
package org.elasticsearch.search.sort;
import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.io.stream.BytesStreamOutput;
import org.elasticsearch.common.io.stream.NamedWriteableAwareStreamInput;
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@ -85,6 +86,8 @@ public abstract class AbstractSortTestCase<T extends SortBuilder & SortBuilderPa
builder.endObject();
XContentParser itemParser = XContentHelper.createParser(builder.bytes());
ParsingException except = new ParsingException(itemParser.getTokenLocation(), "mytext", itemParser.getTokenLocation());
System.out.println(except.getMessage());
itemParser.nextToken();
/*