You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@nifi.apache.org by GitBox <gi...@apache.org> on 2019/01/09 01:49:33 UTC
[GitHub] bdesert closed pull request #3200: NIFI-5826 Fix back-slash
escaping at Lexers
bdesert closed pull request #3200: NIFI-5826 Fix back-slash escaping at Lexers
URL: https://github.com/apache/nifi/pull/3200
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g b/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g
index 6c0bcff19a..fb3958c0ad 100644
--- a/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g
+++ b/nifi-commons/nifi-expression-language/src/main/antlr3/org/apache/nifi/attribute/expression/language/antlr/AttributeExpressionLexer.g
@@ -232,7 +232,7 @@ ESC
| '\\' { setText("\\\\"); }
| nextChar = ~('"' | '\'' | 'r' | 'n' | 't' | '\\')
{
- StringBuilder lBuf = new StringBuilder(); lBuf.append("\\\\").appendCodePoint(nextChar); setText(lBuf.toString());
+ StringBuilder lBuf = new StringBuilder(); lBuf.append("\\").appendCodePoint(nextChar); setText(lBuf.toString());
}
)
;
diff --git a/nifi-commons/nifi-hl7-query-language/src/main/antlr3/org/apache/nifi/hl7/query/antlr/HL7QueryLexer.g b/nifi-commons/nifi-hl7-query-language/src/main/antlr3/org/apache/nifi/hl7/query/antlr/HL7QueryLexer.g
index 478028b9f7..ab9d355107 100644
--- a/nifi-commons/nifi-hl7-query-language/src/main/antlr3/org/apache/nifi/hl7/query/antlr/HL7QueryLexer.g
+++ b/nifi-commons/nifi-hl7-query-language/src/main/antlr3/org/apache/nifi/hl7/query/antlr/HL7QueryLexer.g
@@ -162,7 +162,7 @@ ESC
| '\\' { setText("\\\\"); }
| nextChar = ~('"' | '\'' | 'r' | 'n' | 't' | '\\')
{
- StringBuilder lBuf = new StringBuilder(); lBuf.append("\\\\").appendCodePoint(nextChar); setText(lBuf.toString());
+ StringBuilder lBuf = new StringBuilder(); lBuf.append("\\").appendCodePoint(nextChar); setText(lBuf.toString());
}
)
;
diff --git a/nifi-commons/nifi-record-path/src/main/antlr3/org/apache/nifi/record/path/RecordPathLexer.g b/nifi-commons/nifi-record-path/src/main/antlr3/org/apache/nifi/record/path/RecordPathLexer.g
index cd466f7b6a..b6a838004b 100644
--- a/nifi-commons/nifi-record-path/src/main/antlr3/org/apache/nifi/record/path/RecordPathLexer.g
+++ b/nifi-commons/nifi-record-path/src/main/antlr3/org/apache/nifi/record/path/RecordPathLexer.g
@@ -152,7 +152,7 @@ ESC
| '\\' { setText("\\\\"); }
| nextChar = ~('"' | '\'' | 'r' | 'n' | 't' | '\\')
{
- StringBuilder lBuf = new StringBuilder(); lBuf.append("\\\\").appendCodePoint(nextChar); setText(lBuf.toString());
+ StringBuilder lBuf = new StringBuilder(); lBuf.append("\\").appendCodePoint(nextChar); setText(lBuf.toString());
}
)
;
diff --git a/nifi-commons/nifi-record-path/src/test/java/org/apache/nifi/record/path/TestRecordPath.java b/nifi-commons/nifi-record-path/src/test/java/org/apache/nifi/record/path/TestRecordPath.java
index 67c14e6475..881fb6412c 100644
--- a/nifi-commons/nifi-record-path/src/test/java/org/apache/nifi/record/path/TestRecordPath.java
+++ b/nifi-commons/nifi-record-path/src/test/java/org/apache/nifi/record/path/TestRecordPath.java
@@ -1026,6 +1026,133 @@ public void testReplaceRegex() {
assertEquals("Jxohn Dxoe", RecordPath.compile("replaceRegex(/name, '(?<hello>[JD])', '${hello}x')").evaluate(record).getSelectedFields().findFirst().get().getValue());
assertEquals("48ohn 48oe", RecordPath.compile("replaceRegex(/name, '(?<hello>[JD])', /id)").evaluate(record).getSelectedFields().findFirst().get().getValue());
+
+ }
+
+ @Test
+ public void testReplaceRegexEscapedCharacters() {
+ final List<RecordField> fields = new ArrayList<>();
+ fields.add(new RecordField("id", RecordFieldType.INT.getDataType()));
+ fields.add(new RecordField("name", RecordFieldType.STRING.getDataType()));
+
+ final RecordSchema schema = new SimpleRecordSchema(fields);
+
+ final Map<String, Object> values = new HashMap<>();
+ values.put("id", 48);
+ final Record record = new MapRecord(schema, values);
+
+ // Special character cases
+ values.put("name", "John Doe");
+ assertEquals("Replacing whitespace to new line",
+ "John\nDoe", RecordPath.compile("replaceRegex(/name, '[\\s]', '\\n')")
+ .evaluate(record).getSelectedFields().findFirst().get().getValue());
+
+ values.put("name", "John\nDoe");
+ assertEquals("Replacing new line to whitespace",
+ "John Doe", RecordPath.compile("replaceRegex(/name, '\\n', ' ')")
+ .evaluate(record).getSelectedFields().findFirst().get().getValue());
+
+ values.put("name", "John Doe");
+ assertEquals("Replacing whitespace to tab",
+ "John\tDoe", RecordPath.compile("replaceRegex(/name, '[\\s]', '\\t')")
+ .evaluate(record).getSelectedFields().findFirst().get().getValue());
+
+ values.put("name", "John\tDoe");
+ assertEquals("Replacing tab to whitespace",
+ "John Doe", RecordPath.compile("replaceRegex(/name, '\\t', ' ')")
+ .evaluate(record).getSelectedFields().findFirst().get().getValue());
+
+ }
+
+ @Test
+ public void testReplaceRegexEscapedQuotes() {
+
+ final List<RecordField> fields = new ArrayList<>();
+ fields.add(new RecordField("id", RecordFieldType.INT.getDataType()));
+ fields.add(new RecordField("name", RecordFieldType.STRING.getDataType()));
+
+ final RecordSchema schema = new SimpleRecordSchema(fields);
+
+ final Map<String, Object> values = new HashMap<>();
+ values.put("id", 48);
+ final Record record = new MapRecord(schema, values);
+
+ // Quotes
+ // NOTE: At Java code, a single back-slash needs to be escaped with another-back slash, but needn't to do so at NiFi UI.
+ // The test record path is equivalent to replaceRegex(/name, '\'', '"')
+ values.put("name", "'John' 'Doe'");
+ assertEquals("Replacing quote to double-quote",
+ "\"John\" \"Doe\"", RecordPath.compile("replaceRegex(/name, '\\'', '\"')")
+ .evaluate(record).getSelectedFields().findFirst().get().getValue());
+
+ values.put("name", "\"John\" \"Doe\"");
+ assertEquals("Replacing double-quote to single-quote",
+ "'John' 'Doe'", RecordPath.compile("replaceRegex(/name, '\"', '\\'')")
+ .evaluate(record).getSelectedFields().findFirst().get().getValue());
+
+ values.put("name", "'John' 'Doe'");
+ assertEquals("Replacing quote to double-quote, the function arguments are wrapped by double-quote",
+ "\"John\" \"Doe\"", RecordPath.compile("replaceRegex(/name, \"'\", \"\\\"\")")
+ .evaluate(record).getSelectedFields().findFirst().get().getValue());
+
+ values.put("name", "\"John\" \"Doe\"");
+ assertEquals("Replacing double-quote to single-quote, the function arguments are wrapped by double-quote",
+ "'John' 'Doe'", RecordPath.compile("replaceRegex(/name, \"\\\"\", \"'\")")
+ .evaluate(record).getSelectedFields().findFirst().get().getValue());
+
+ }
+
+ @Test
+ public void testReplaceRegexEscapedBackSlashes() {
+
+ final List<RecordField> fields = new ArrayList<>();
+ fields.add(new RecordField("id", RecordFieldType.INT.getDataType()));
+ fields.add(new RecordField("name", RecordFieldType.STRING.getDataType()));
+
+ final RecordSchema schema = new SimpleRecordSchema(fields);
+
+ final Map<String, Object> values = new HashMap<>();
+ values.put("id", 48);
+ final Record record = new MapRecord(schema, values);
+
+ // Back-slash
+ // NOTE: At Java code, a single back-slash needs to be escaped with another-back slash, but needn't to do so at NiFi UI.
+ // The test record path is equivalent to replaceRegex(/name, '\\', '/')
+ values.put("name", "John\\Doe");
+ assertEquals("Replacing a back-slash to forward-slash",
+ "John/Doe", RecordPath.compile("replaceRegex(/name, '\\\\', '/')")
+ .evaluate(record).getSelectedFields().findFirst().get().getValue());
+
+ values.put("name", "John/Doe");
+ assertEquals("Replacing a forward-slash to back-slash",
+ "John\\Doe", RecordPath.compile("replaceRegex(/name, '/', '\\\\')")
+ .evaluate(record).getSelectedFields().findFirst().get().getValue());
+
+ }
+
+ @Test
+ public void testReplaceRegexEscapedBrackets() {
+
+ final List<RecordField> fields = new ArrayList<>();
+ fields.add(new RecordField("id", RecordFieldType.INT.getDataType()));
+ fields.add(new RecordField("name", RecordFieldType.STRING.getDataType()));
+
+ final RecordSchema schema = new SimpleRecordSchema(fields);
+
+ final Map<String, Object> values = new HashMap<>();
+ values.put("id", 48);
+ final Record record = new MapRecord(schema, values);
+
+ // Brackets
+ values.put("name", "J[o]hn Do[e]");
+ assertEquals("Square brackets can be escaped with back-slash",
+ "J(o)hn Do(e)", RecordPath.compile("replaceRegex(replaceRegex(/name, '\\[', '('), '\\]', ')')")
+ .evaluate(record).getSelectedFields().findFirst().get().getValue());
+
+ values.put("name", "J(o)hn Do(e)");
+ assertEquals("Brackets can be escaped with back-slash",
+ "J[o]hn Do[e]", RecordPath.compile("replaceRegex(replaceRegex(/name, '\\(', '['), '\\)', ']')")
+ .evaluate(record).getSelectedFields().findFirst().get().getValue());
}
@Test
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services