Apache/nifi
1
0
Fork 0
mirror of https://github.com/apache/nifi.git synced 2025-02-11 12:35:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

NIFI-13890 Fixed referencing components for quoted parameter names (#9411)

Browse Source 
Signed-off-by: David Handermann <exceptionfactory@apache.org>
This commit is contained in:
Pierre Villard 2024-10-18 14:56:51 +02:00 committed by GitHub
parent 811af23343
commit 56f859f37f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nifi-commons/nifi-parameter/src/main/java/org/apache/nifi/parameter/AbstractParameterParser.java
View File

@ -45,7 +45,19 @@ public abstract class AbstractParameterParser implements ParameterParser {
final ParameterToken token; final ParameterToken token;
if (sequentialStartTags % 2 == 1) { if (sequentialStartTags % 2 == 1) {
final String parameterName = input.substring(startCharIndex + sequentialStartTags + 1, endCharIndex); final String parameterName = input.substring(startCharIndex + sequentialStartTags + 1, endCharIndex);
token = new StandardParameterReference(parameterName, startOffset, endCharIndex, referenceText); if (parameterName.contains("'")) {
if (parameterName.startsWith("'") && parameterName.endsWith("'")) {
final String parameterNameWithoutQuotes = parameterName.substring(1, parameterName.length() - 1);
if (parameterNameWithoutQuotes.contains("'")) {
return null;
}
token = new StandardParameterReference(parameterNameWithoutQuotes, startOffset, endCharIndex, referenceText);
} else {
return null;
}
} else {
token = new StandardParameterReference(parameterName, startOffset, endCharIndex, referenceText);
}
} else { } else {
token = new EscapedParameterReference(startOffset, endCharIndex, referenceText); token = new EscapedParameterReference(startOffset, endCharIndex, referenceText);
} }

10
nifi-commons/nifi-parameter/src/test/java/org/apache/nifi/parameter/TestExpressionLanguageAgnosticParameterParser.java
View File

@ -164,8 +164,10 @@ public class TestExpressionLanguageAgnosticParameterParser {
@Test @Test
public void testNonReferences() { public void testNonReferences() {
final ParameterParser parameterParser = new ExpressionLanguageAgnosticParameterParser(); final ParameterParser parameterParser = new ExpressionLanguageAgnosticParameterParser();
final String[] badReferences = new String[] {"#foo", "Some text #{blah foo", "#foo}", "#}foo{",
"#{'fo'o}", "#{'My'Param'}", "#f{oo}", "#", "##", "###", "####", "#####", "#{", "##{", "###{"};
for (final String input : new String[] {"#foo", "Some text #{blah foo", "#foo}", "#}foo{", "#f{oo}", "#", "##", "###", "####", "#####", "#{", "##{", "###{"}) { for (final String input : badReferences) {
assertEquals(0, parameterParser.parseTokens(input).toList().size()); assertEquals(0, parameterParser.parseTokens(input).toList().size());
} }
} }
@ -180,7 +182,7 @@ public class TestExpressionLanguageAgnosticParameterParser {
@Test @Test
public void testReferenceInsideAndOutsideExpressionLanguage() { public void testReferenceInsideAndOutsideExpressionLanguage() {
final ParameterParser parameterParser = new ExpressionLanguageAgnosticParameterParser(); final ParameterParser parameterParser = new ExpressionLanguageAgnosticParameterParser();
final List<ParameterToken> tokens = parameterParser.parseTokens("#{hello}${#{hello}:toUpper()}#{hello}").toList(); final List<ParameterToken> tokens = parameterParser.parseTokens("#{hello}${#{'hello'}:toUpper()}#{hello}").toList();
assertEquals(3, tokens.size()); assertEquals(3, tokens.size());
for (final ParameterToken token : tokens) { for (final ParameterToken token : tokens) {
@ -206,12 +208,12 @@ public class TestExpressionLanguageAgnosticParameterParser {
@Test @Test
public void testMultipleReferencesSameExpression() { public void testMultipleReferencesSameExpression() {
final ParameterParser parameterParser = new ExpressionLanguageAgnosticParameterParser(); final ParameterParser parameterParser = new ExpressionLanguageAgnosticParameterParser();
final List<ParameterToken> tokens = parameterParser.parseTokens("${#{hello}:append(#{there})}").toList(); final List<ParameterToken> tokens = parameterParser.parseTokens("${#{'my parameter'}:append(#{there})}").toList();
assertEquals(2, tokens.size()); assertEquals(2, tokens.size());
final ParameterToken firstToken = tokens.get(0); final ParameterToken firstToken = tokens.get(0);
assertTrue(firstToken.isParameterReference()); assertTrue(firstToken.isParameterReference());
assertEquals("hello", ((ParameterReference) firstToken).getParameterName()); assertEquals("my parameter", ((ParameterReference) firstToken).getParameterName());
final ParameterToken secondToken = tokens.get(1); final ParameterToken secondToken = tokens.get(1);
assertTrue(secondToken.isParameterReference()); assertTrue(secondToken.isParameterReference());