Address comments

Signed-off-by: Craig Perkins <cwperx@amazon.com>

Author: cwperks

data-prepper-expression/src/main/antlr/DataPrepperExpression.g4

@@ -182,7 +182,6 @@ literal
     | Integer
     | Boolean
     | String
-    | RawString
     | Null
     ;
 
@@ -270,12 +269,9 @@ VariableNameCharacter
     | [0-9-]
     ;
 
-RawString
-    : [r] DOUBLEQUOTE StringCharacters? DOUBLEQUOTE
-    ;
-
 String
     : DOUBLEQUOTE StringCharacters? DOUBLEQUOTE
+    | DOUBLEQUOTE DOUBLEQUOTE DOUBLEQUOTE StringCharacters? DOUBLEQUOTE DOUBLEQUOTE DOUBLEQUOTE
     ;
 
 fragment

data-prepper-expression/src/main/java/org/opensearch/dataprepper/expression/ParseTreeCoercionService.java

@@ -68,11 +68,10 @@ 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);
+                final String nodeStringValueWithQuotesStripped = nodeStringValue != null
+                        ? nodeStringValue.replaceAll("^\"{1,3}|\"{1,3}$", "")
+                        : null;
                 return nodeStringValueWithQuotesStripped;
-            case DataPrepperExpressionParser.RawString:
-                final String nodeStringValueWithRAndQuotesStripped = nodeStringValue.substring(2, nodeStringValue.length() - 1);
-                return nodeStringValueWithRAndQuotesStripped;
             case DataPrepperExpressionParser.Integer:
                 Long longValue = Long.valueOf(nodeStringValue);
                 if (longValue > Integer.MAX_VALUE || longValue < Integer.MIN_VALUE) {

data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/GenericExpressionEvaluator_ConditionalIT.java

@@ -192,8 +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 == " + rawString("/path/to/route"), event("{\"path\": \"/path/to/route\"}"), true),
-                arguments("/path == " + rawString("/path/to/route"), event("{\"path\": \"/incorrect/path\"}"), false),
+                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),
@@ -354,10 +354,6 @@ private static String escapedJsonPointer(final String pointer) {
         return "\"/" + pointer + "\"";
     }
 
-    private static String rawString(final String original) {
-        return "r\"" + original + "\"";
-    }
-
     private static Event event(final String data) {
         return JacksonEvent.builder().withEventType("event").withData(data).build();
     }

data-prepper-expression/src/test/java/org/opensearch/dataprepper/expression/ParseTreeCoercionServiceTest.java

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