Skip to content

Update AbstractXContentParser to support parsers that don't provide text characters #129005

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 6 commits into from
Jun 6, 2025
Merged

Update AbstractXContentParser to support parsers that don't provide text characters #129005

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dff831a
Update AbstractXContentParser to handle parsers that don't have text …
Mikep86 Jun 5, 2025
1c215a3
Added test
Mikep86 Jun 5, 2025
d707df6
Update docs/changelog/129005.yaml
Mikep86 Jun 5, 2025
a5ea65c
Extend test
Mikep86 Jun 5, 2025
53ee7d0
Merge branch 'main' into map-x-content-parser_parse-boolean-strings
elasticmachine Jun 5, 2025
870f162
Merge branch 'main' into map-x-content-parser_parse-boolean-strings
elasticmachine Jun 6, 2025
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: 6 additions & 0 deletions docs/changelog/129005.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
pr: 129005
summary: Update AbstractXContentParser to support parsers that don't provide text
characters
area: Infra/Core
type: bug
issues: []
14 changes: 12 additions & 2 deletions libs/x-content/src/main/java/org/elasticsearch/xcontent/support/AbstractXContentParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,13 @@ void ensureNumberConversion(boolean coerce, long result, Class<? extends Number>
public boolean isBooleanValue() throws IOException {
return switch (currentToken()) {
case VALUE_BOOLEAN -> true;
case VALUE_STRING -> Booleans.isBoolean(textCharacters(), textOffset(), textLength());
case VALUE_STRING -> {
if (hasTextCharacters()) {
yield Booleans.isBoolean(textCharacters(), textOffset(), textLength());
} else {
yield Booleans.isBoolean(text());
}
}
default -> false;
};
}
Expand All @@ -94,7 +100,11 @@ public boolean isBooleanValue() throws IOException {
public boolean booleanValue() throws IOException {
Token token = currentToken();
if (token == Token.VALUE_STRING) {
return Booleans.parseBoolean(textCharacters(), textOffset(), textLength(), false /* irrelevant */);
if (hasTextCharacters()) {
return Booleans.parseBoolean(textCharacters(), textOffset(), textLength(), false /* irrelevant */);
} else {
return Booleans.parseBoolean(text(), false /* irrelevant */);
}
}
return doBooleanValue();
}
Expand Down
18 changes: 18 additions & 0 deletions libs/x-content/src/test/java/org/elasticsearch/xcontent/MapXContentParserTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,24 @@ public void testCopyCurrentStructure() throws IOException {
}
}

public void testParseBooleanStringValue() throws IOException {
try (
XContentParser parser = new MapXContentParser(
xContentRegistry(),
LoggingDeprecationHandler.INSTANCE,
Map.of("bool_key", "true"),
randomFrom(XContentType.values())
)
) {
assertEquals(XContentParser.Token.START_OBJECT, parser.nextToken());
assertEquals(XContentParser.Token.FIELD_NAME, parser.nextToken());
assertEquals(XContentParser.Token.VALUE_STRING, parser.nextToken());
assertTrue(parser.isBooleanValue());
assertTrue(parser.booleanValue());
assertEquals(XContentParser.Token.END_OBJECT, parser.nextToken());
}
}

private void compareTokens(CheckedConsumer<XContentBuilder, IOException> consumer) throws IOException {
for (XContentType xContentType : EnumSet.allOf(XContentType.class)) {
logger.info("--> testing with xcontent type: {}", xContentType);
Expand Down
Loading