You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by al...@apache.org on 2016/01/23 03:03:22 UTC
nifi git commit: NIFI-1415: Do not enfoce that a password or Private
Key Passphrase is set
Repository: nifi
Updated Branches:
refs/heads/master a7d3f8d75 -> 93e2c5219
NIFI-1415: Do not enfoce that a password or Private Key Passphrase is set
Signed-off-by: Aldrin Piri <al...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/93e2c521
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/93e2c521
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/93e2c521
Branch: refs/heads/master
Commit: 93e2c5219599f24b54517dd43195c3d121030c5e
Parents: a7d3f8d
Author: Mark Payne <ma...@hotmail.com>
Authored: Wed Jan 20 10:22:40 2016 -0500
Committer: Aldrin Piri <al...@apache.org>
Committed: Fri Jan 22 20:46:14 2016 -0500
----------------------------------------------------------------------
.../nifi/processors/standard/FetchSFTP.java | 18 ------------------
1 file changed, 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/93e2c521/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchSFTP.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchSFTP.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchSFTP.java
index 56d40dd..79eb1e6 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchSFTP.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchSFTP.java
@@ -18,8 +18,6 @@
package org.apache.nifi.processors.standard;
import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import org.apache.nifi.annotation.behavior.InputRequirement;
@@ -30,8 +28,6 @@ import org.apache.nifi.annotation.documentation.CapabilityDescription;
import org.apache.nifi.annotation.documentation.SeeAlso;
import org.apache.nifi.annotation.documentation.Tags;
import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.components.ValidationContext;
-import org.apache.nifi.components.ValidationResult;
import org.apache.nifi.processor.ProcessContext;
import org.apache.nifi.processors.standard.util.FileTransfer;
import org.apache.nifi.processors.standard.util.SFTPTransfer;
@@ -74,20 +70,6 @@ public class FetchSFTP extends FetchFileTransfer {
}
@Override
- protected Collection<ValidationResult> customValidate(final ValidationContext validationContext) {
- if (!validationContext.getProperty(SFTPTransfer.PASSWORD).isSet() && !(validationContext.getProperty(SFTPTransfer.PRIVATE_KEY_PASSPHRASE).isSet()
- && validationContext.getProperty(SFTPTransfer.PRIVATE_KEY_PATH).isSet())) {
- return Collections.singleton(new ValidationResult.Builder()
- .subject("Password")
- .valid(false)
- .explanation("Must set either password or Private Key Path & Passphrase")
- .build());
- }
-
- return Collections.emptyList();
- }
-
- @Override
protected FileTransfer createFileTransfer(final ProcessContext context) {
return new SFTPTransfer(context, getLogger());
}