Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-631: Correct the WritesAttributes descriptions. 

Reviewed and Ammended (based on comments from dev list) by Tony Kurc (tkurc@apache.org)
This commit is contained in:
Joe Skora 2015-11-25 14:49:15 -05:00 committed by trkurc
parent ba83bf9c05
commit 226ac64ef9
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/FetchFile.java
View File

@ -73,7 +73,7 @@ public class FetchFile extends AbstractProcessor {
.description("The fully-qualified filename of the file to fetch from the file system") .description("The fully-qualified filename of the file to fetch from the file system")
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR) .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
.expressionLanguageSupported(true) .expressionLanguageSupported(true)
.defaultValue("${path}/${filename}") .defaultValue("${absolute.path}/${filename}")
.required(true) .required(true)
.build(); .build();
static final PropertyDescriptor COMPLETION_STRATEGY = new PropertyDescriptor.Builder() static final PropertyDescriptor COMPLETION_STRATEGY = new PropertyDescriptor.Builder()

19
nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFile.java
View File

@ -72,11 +72,16 @@ import org.apache.nifi.processors.standard.util.FileInfo;
"GetFile, this Processor does not delete any data from the local filesystem.") "GetFile, this Processor does not delete any data from the local filesystem.")
@WritesAttributes({ @WritesAttributes({
@WritesAttribute(attribute="filename", description="The name of the file that was read from filesystem."), @WritesAttribute(attribute="filename", description="The name of the file that was read from filesystem."),
@WritesAttribute(attribute="path", description="The path is set to the absolute path of the file's directory " + @WritesAttribute(attribute="path", description="The path is set to the relative path of the file's directory " +
"on filesystem. For example, if the Directory property is set to /tmp, then files picked up from " + "on filesystem compared to the Input Directory property. For example, if Input Directory is set to " +
"/tmp will have the path attribute set to \"./\". If the Recurse Subdirectories property is set to " + "/tmp, then files picked up from /tmp will have the path attribute set to \"/\". If the Recurse " +
"true and a file is picked up from /tmp/abc/1/2/3, then the path attribute will be set to " + "Subdirectories property is set to true and a file is picked up from /tmp/abc/1/2/3, then the path " +
"\"/tmp/abc/1/2/3\"."), "attribute will be set to \"abc/1/2/3/\"."),
@WritesAttribute(attribute="absolute.path", description="The absolute.path is set to the absolute path of " +
"the file's directory on filesystem. For example, if the Input Directory property is set to /tmp, " +
"then files picked up from /tmp will have the path attribute set to \"/tmp/\". If the Recurse " +
"Subdirectories property is set to true and a file is picked up from /tmp/abc/1/2/3, then the path " +
"attribute will be set to \"/tmp/abc/1/2/3/\"."),
@WritesAttribute(attribute="fs.owner", description="The user that owns the file in filesystem"), @WritesAttribute(attribute="fs.owner", description="The user that owns the file in filesystem"),
@WritesAttribute(attribute="fs.group", description="The group that owns the file in filesystem"), @WritesAttribute(attribute="fs.group", description="The group that owns the file in filesystem"),
@WritesAttribute(attribute="fs.lastModified", description="The timestamp of when the file in filesystem was " + @WritesAttribute(attribute="fs.lastModified", description="The timestamp of when the file in filesystem was " +
@ -217,9 +222,7 @@ public class ListFile extends AbstractListProcessor<FileInfo> {
final Path relativePath = directoryPath.relativize(filePath.getParent()); final Path relativePath = directoryPath.relativize(filePath.getParent());
String relativePathString = relativePath.toString() + "/"; String relativePathString = relativePath.toString() + "/";
if (relativePathString.isEmpty()) {
relativePathString = "./";
}
final Path absPath = filePath.toAbsolutePath(); final Path absPath = filePath.toAbsolutePath();
final String absPathString = absPath.getParent().toString() + "/"; final String absPathString = absPath.getParent().toString() + "/";