You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2018/02/21 17:47:52 UTC
nifi git commit: NIFI-4815 - Add EL support to ExecuteProcess
Repository: nifi
Updated Branches:
refs/heads/master bc3701569 -> ff95be2a1
NIFI-4815 - Add EL support to ExecuteProcess
Signed-off-by: Matthew Burgess <ma...@apache.org>
This closes #2432
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/ff95be2a
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/ff95be2a
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/ff95be2a
Branch: refs/heads/master
Commit: ff95be2a118ec5bde1ad88ae2ad8557cd93323a4
Parents: bc37015
Author: Pierre Villard <pi...@gmail.com>
Authored: Thu Jan 25 16:29:10 2018 +0100
Committer: Matthew Burgess <ma...@apache.org>
Committed: Wed Feb 21 12:47:33 2018 -0500
----------------------------------------------------------------------
.../org/apache/nifi/processors/standard/ExecuteProcess.java | 8 ++++----
.../apache/nifi/processors/standard/TestExecuteProcess.java | 7 ++++++-
2 files changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/ff95be2a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java
index a7c41fe..c1ab946 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ExecuteProcess.java
@@ -85,7 +85,7 @@ public class ExecuteProcess extends AbstractProcessor {
.name("Command")
.description("Specifies the command to be executed; if just the name of an executable is provided, it must be in the user's environment PATH.")
.required(true)
- .expressionLanguageSupported(false)
+ .expressionLanguageSupported(true)
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.build();
@@ -100,7 +100,7 @@ public class ExecuteProcess extends AbstractProcessor {
public static final PropertyDescriptor WORKING_DIR = new PropertyDescriptor.Builder()
.name("Working Directory")
.description("The directory to use as the current working directory when executing the command")
- .expressionLanguageSupported(false)
+ .expressionLanguageSupported(true)
.addValidator(StandardValidators.createDirectoryExistsValidator(false, true))
.required(false)
.build();
@@ -213,7 +213,7 @@ public class ExecuteProcess extends AbstractProcessor {
final Long batchNanos = context.getProperty(BATCH_DURATION).asTimePeriod(TimeUnit.NANOSECONDS);
- final String command = context.getProperty(COMMAND).getValue();
+ final String command = context.getProperty(COMMAND).evaluateAttributeExpressions().getValue();
final String arguments = context.getProperty(COMMAND_ARGUMENTS).isSet()
? context.getProperty(COMMAND_ARGUMENTS).evaluateAttributeExpressions().getValue()
: null;
@@ -311,7 +311,7 @@ public class ExecuteProcess extends AbstractProcessor {
final Boolean redirectErrorStream = context.getProperty(REDIRECT_ERROR_STREAM).asBoolean();
final ProcessBuilder builder = new ProcessBuilder(commandStrings);
- final String workingDirName = context.getProperty(WORKING_DIR).getValue();
+ final String workingDirName = context.getProperty(WORKING_DIR).evaluateAttributeExpressions().getValue();
if (workingDirName != null) {
builder.directory(new File(workingDirName));
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/ff95be2a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java
index 0d2ed48..a5a08f0 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestExecuteProcess.java
@@ -105,7 +105,8 @@ public class TestExecuteProcess {
@Test
public void validateProcessInterruptOnStop() throws Exception {
final TestRunner runner = TestRunners.newTestRunner(ExecuteProcess.class);
- runner.setProperty(ExecuteProcess.COMMAND, "ping");
+ runner.setVariable("command", "ping");
+ runner.setProperty(ExecuteProcess.COMMAND, "${command}");
runner.setProperty(ExecuteProcess.COMMAND_ARGUMENTS, "nifi.apache.org");
runner.setProperty(ExecuteProcess.BATCH_DURATION, "500 millis");
@@ -127,6 +128,10 @@ public class TestExecuteProcess {
fail();
}
+ final List<MockFlowFile> flowFiles = runner.getFlowFilesForRelationship(ExecuteProcess.REL_SUCCESS);
+ if(!flowFiles.isEmpty()) {
+ assertTrue(flowFiles.get(0).getAttribute("command").equals("ping"));
+ }
}
// @Test