You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2022/07/01 00:12:57 UTC
[nifi] 02/02: NIFI-10186 Corrected PutFTP Remote Path Property EL
This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
commit 26a10d772f3b552d460a55634107cb3022a490cd
Author: Paul Grey <gr...@yahoo.com>
AuthorDate: Thu Jun 30 15:03:40 2022 -0400
NIFI-10186 Corrected PutFTP Remote Path Property EL
This closes #6173
Signed-off-by: David Handermann <ex...@apache.org>
---
.../src/main/java/org/apache/nifi/processors/standard/PutFTP.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java
index 50ae599b6f..e26ec43cf8 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/PutFTP.java
@@ -39,6 +39,7 @@ import org.apache.nifi.annotation.lifecycle.OnScheduled;
import org.apache.nifi.components.PropertyDescriptor;
import org.apache.nifi.components.ValidationContext;
import org.apache.nifi.components.ValidationResult;
+import org.apache.nifi.expression.ExpressionLanguageScope;
import org.apache.nifi.flowfile.FlowFile;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processor.ProcessorInitializationContext;
@@ -71,6 +72,11 @@ public class PutFTP extends PutFileTransfer<FTPTransfer> {
private List<PropertyDescriptor> properties;
+ // PutFileTransfer.onTrigger() uses FlowFile attributes
+ public static final PropertyDescriptor REMOTE_PATH = new PropertyDescriptor.Builder()
+ .fromPropertyDescriptor(FTPTransfer.REMOTE_PATH)
+ .expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES).build();
+
@Override
protected void init(final ProcessorInitializationContext context) {
final List<PropertyDescriptor> properties = new ArrayList<>();
@@ -78,7 +84,7 @@ public class PutFTP extends PutFileTransfer<FTPTransfer> {
properties.add(FTPTransfer.PORT);
properties.add(FTPTransfer.USERNAME);
properties.add(FTPTransfer.PASSWORD);
- properties.add(FTPTransfer.REMOTE_PATH);
+ properties.add(REMOTE_PATH);
properties.add(FTPTransfer.CREATE_DIRECTORY);
properties.add(FTPTransfer.BATCH_SIZE);
properties.add(FTPTransfer.CONNECTION_TIMEOUT);