Skip to content

Support triple quote strings to disambiguate between String and EscapedJsonPointer #5655

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
kkondaka merged 6 commits into from
Jul 16, 2025
Merged

Support triple quote strings to disambiguate between String and EscapedJsonPointer #5655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
498c931
Introduce RawString type to allow strings that begin with forward slash
cwperks Apr 25, 2025
3acd31b
Add tests in GenericExpressionEvaluator_ConditionalIT
cwperks Apr 30, 2025
66e6e3e
Merge branch 'main' into raw-string
cwperks May 6, 2025
45587eb
Address comments
cwperks May 6, 2025
009d762
Improve coverage
cwperks May 6, 2025
7578d95
Merge branch 'main' into raw-string
cwperks May 20, 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
1 change: 1 addition & 0 deletions data-prepper-expression/src/main/antlr/DataPrepperExpression.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ VariableNameCharacter

String
: DOUBLEQUOTE StringCharacters? DOUBLEQUOTE
| DOUBLEQUOTE DOUBLEQUOTE DOUBLEQUOTE StringCharacters? DOUBLEQUOTE DOUBLEQUOTE DOUBLEQUOTE
;

fragment
Expand Down
4 changes: 1 addition & 3 deletions ...ression/src/main/java/org/opensearch/dataprepper/expression/ParseTreeCoercionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ public Object coercePrimaryTerminalNode(final TerminalNode node, final Event eve
case DataPrepperExpressionParser.JsonPointer:
return resolveJsonPointerValue(nodeStringValue, event);
case DataPrepperExpressionParser.String:
final String nodeStringValueWithQuotesStripped = nodeStringValue.substring(1,
nodeStringValue.length() - 1);
return nodeStringValueWithQuotesStripped;
return nodeStringValue.replaceAll("^\"{1,3}|\"{1,3}$", "");
case DataPrepperExpressionParser.Integer:
Long longValue = Long.valueOf(nodeStringValue);
if (longValue > Integer.MAX_VALUE || longValue < Integer.MIN_VALUE) {
Expand Down
2 changes: 2 additions & 0 deletions .../java/org/opensearch/dataprepper/expression/GenericExpressionEvaluator_ConditionalIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,8 @@ private static Stream<Arguments> validExpressionArguments() {
arguments("/should_drop", event("{\"should_drop\": true}"), true),
arguments("/should_drop", event("{\"should_drop\": false}"), false),
arguments("/logs/2/should_drop", event("{\"logs\": [{}, {}, {\"should_drop\": true}]}"), true),
arguments("/path == \"\"\"/path/to/route\"\"\"", event("{\"path\": \"/path/to/route\"}"), true),
arguments("/path == \"\"\"/path/to/route\"\"\"", event("{\"path\": \"/incorrect/path\"}"), false),
arguments(
escapedJsonPointer(ALL_JACKSON_EVENT_GET_SUPPORTED_CHARACTERS) + " == true",
complexEvent(ALL_JACKSON_EVENT_GET_SUPPORTED_CHARACTERS, true),
Expand Down
12 changes: 12 additions & 0 deletions ...ion/src/test/java/org/opensearch/dataprepper/expression/ParseTreeCoercionServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,6 +226,18 @@ void testCoerceTerminalNodeEscapeJsonPointerTypeUnSupportedValues() {
assertThrows(ExpressionCoercionException.class, () -> objectUnderTest.coercePrimaryTerminalNode(terminalNode, testEvent));
}

@ParameterizedTest
@MethodSource("provideSupportedJsonPointerValues")
void testCoerceTerminalNodeTripleQuoteStringTypeSupportedValues(final Object testValue) {
final String testKey = "/testKey";
final String testTruipleQuoteStringKey = "\"\"\"/testKey\"\"\"";
when(token.getType()).thenReturn(DataPrepperExpressionParser.String);
when(terminalNode.getSymbol()).thenReturn(token);
when(terminalNode.getText()).thenReturn(testTruipleQuoteStringKey);
final Object result = objectUnderTest.coercePrimaryTerminalNode(terminalNode, null);
assertThat(result, equalTo(testKey));
}

@Test
void testCoerceTerminalNodeJsonPointerTypeUnSupportedValues() {
final String testKey1 = "key1";
Expand Down
Loading