Skip to content

Fix parseNamedObject leaving end object token #53400

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
Mar 12, 2020
Merged

Fix parseNamedObject leaving end object token #53400

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
6 changes: 5 additions & 1 deletion libs/x-content/src/main/java/org/elasticsearch/common/xcontent/ObjectParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,11 @@ public <T> void declareNamedObject(BiConsumer<Value, T> consumer, NamedObjectPar
assert token == XContentParser.Token.FIELD_NAME;
String name = p.currentName();
try {
return namedObjectParser.parse(p, c, name);
T namedObject = namedObjectParser.parse(p, c, name);
// consume the end object token
token = p.nextToken();
assert token == XContentParser.Token.END_OBJECT;
return namedObject;
} catch (Exception e) {
throw new XContentParseException(p.getTokenLocation(), "[" + field + "] failed to parse field [" + name + "]", e);
}
Expand Down
12 changes: 10 additions & 2 deletions libs/x-content/src/test/java/org/elasticsearch/common/xcontent/ObjectParserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,10 +500,12 @@ public void setString_or_null(String string_or_null) {
}

public void testParseNamedObject() throws IOException {
XContentParser parser = createParser(JsonXContent.jsonXContent, "{\"named\": { \"a\": {\"foo\" : 11} }}");
XContentParser parser = createParser(JsonXContent.jsonXContent,
"{\"named\": { \"a\": {\"foo\" : 11} }, \"bar\": \"baz\"}");
NamedObjectHolder h = NamedObjectHolder.PARSER.apply(parser, null);
assertEquals("a", h.named.name);
assertEquals(11, h.named.foo);
assertEquals("baz", h.bar);
}

public void testParseNamedObjectUnexpectedArray() throws IOException {
Expand Down Expand Up @@ -726,7 +728,7 @@ public void testNoopDeclareField() throws IOException {
assertEquals("parser for [noop] did not end on END_ARRAY", e.getMessage());
}

public void testNoopDeclareObjectArray() throws IOException {
public void testNoopDeclareObjectArray() {
ObjectParser<AtomicReference<String>, Void> parser = new ObjectParser<>("noopy", AtomicReference::new);
parser.declareString(AtomicReference::set, new ParseField("body"));
parser.declareObjectArray((a,b) -> {}, (p, c) -> null, new ParseField("noop"));
Expand All @@ -747,13 +749,19 @@ static class NamedObjectHolder {
NamedObjectHolder::new);
static {
PARSER.declareNamedObject(NamedObjectHolder::setNamed, NamedObject.PARSER, new ParseField("named"));
PARSER.declareString(NamedObjectHolder::setBar, new ParseField("bar"));
}

private NamedObject named;
private String bar;

public void setNamed(NamedObject named) {
this.named = named;
}

public void setBar(String bar) {
this.bar = bar;
}
}

// plural
Expand Down