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 2015/12/03 22:35:46 UTC
[1/3] nifi git commit: NIFI-1246: When calculating relative paths,
ensure that we have an absolute path
Repository: nifi
Updated Branches:
refs/heads/master 3656c883c -> dce039b54
NIFI-1246: When calculating relative paths, ensure that we have an absolute path
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/3b7512eb
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/3b7512eb
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/3b7512eb
Branch: refs/heads/master
Commit: 3b7512ebacf6317481315c23c56fdf149167824f
Parents: dae25ac
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Dec 3 13:42:19 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Dec 3 16:06:03 2015 -0500
----------------------------------------------------------------------
.../nifi/processors/standard/ListFile.java | 5 +-
.../nifi/processors/standard/TestListFile.java | 101 +++++++------------
2 files changed, 38 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/3b7512eb/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFile.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFile.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFile.java
index cdc09a9..30f4958 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFile.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListFile.java
@@ -220,8 +220,9 @@ public class ListFile extends AbstractListProcessor<FileInfo> {
final Path filePath = file.toPath();
final Path directoryPath = new File(getPath(context)).toPath();
- final Path relativePath = directoryPath.relativize(filePath.getParent());
- String relativePathString = relativePath.toString() + "/";
+ final Path relativePath = directoryPath.toAbsolutePath().relativize(filePath.getParent());
+ String relativePathString = relativePath.toString();
+ relativePathString = relativePathString.isEmpty() ? "./" : relativePathString + "/";
final Path absPath = filePath.toAbsolutePath();
final String absPathString = absPath.getParent().toString() + "/";
http://git-wip-us.apache.org/repos/asf/nifi/blob/3b7512eb/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListFile.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListFile.java b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListFile.java
index ef20299..4ae7714 100644
--- a/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListFile.java
+++ b/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-processors/src/test/java/org/apache/nifi/processors/standard/TestListFile.java
@@ -18,16 +18,9 @@
package org.apache.nifi.processors.standard;
-import org.apache.nifi.components.PropertyDescriptor;
-import org.apache.nifi.flowfile.attributes.CoreAttributes;
-import org.apache.nifi.processor.ProcessContext;
-import org.apache.nifi.processor.Relationship;
-import org.apache.nifi.util.MockFlowFile;
-import org.apache.nifi.util.TestRunner;
-import org.apache.nifi.util.TestRunners;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.FileOutputStream;
@@ -35,16 +28,22 @@ import java.io.IOException;
import java.nio.file.FileStore;
import java.nio.file.Files;
import java.nio.file.Path;
-import java.nio.file.attribute.PosixFilePermission;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.List;
import java.util.Locale;
import java.util.Set;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
+import org.apache.nifi.components.PropertyDescriptor;
+import org.apache.nifi.flowfile.attributes.CoreAttributes;
+import org.apache.nifi.processor.ProcessContext;
+import org.apache.nifi.processor.Relationship;
+import org.apache.nifi.util.MockFlowFile;
+import org.apache.nifi.util.TestRunner;
+import org.apache.nifi.util.TestRunners;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
public class TestListFile {
@@ -423,8 +422,27 @@ public class TestListFile {
runner.setProperty(ListFile.DIRECTORY, testDir.getAbsolutePath());
runner.setProperty(ListFile.RECURSE, "true");
runner.run();
- runner.assertAllFlowFilesTransferred(ListFile.REL_SUCCESS);
+ runner.assertAllFlowFilesTransferred(ListFile.REL_SUCCESS, 3);
final List<MockFlowFile> successFiles1 = runner.getFlowFilesForRelationship(ListFile.REL_SUCCESS);
+ for (final MockFlowFile mff : successFiles1) {
+ final String filename = mff.getAttribute(CoreAttributes.FILENAME.key());
+ final String path = mff.getAttribute(CoreAttributes.PATH.key());
+
+ switch (filename) {
+ case "file1.txt":
+ assertEquals("./", path);
+ mff.assertAttributeEquals(CoreAttributes.ABSOLUTE_PATH.key(), file1.getParentFile().getAbsolutePath() + "/");
+ break;
+ case "file2.txt":
+ assertEquals("subdir1/", path);
+ mff.assertAttributeEquals(CoreAttributes.ABSOLUTE_PATH.key(), file2.getParentFile().getAbsolutePath() + "/");
+ break;
+ case "file3.txt":
+ assertEquals("subdir1/subdir2/", path);
+ mff.assertAttributeEquals(CoreAttributes.ABSOLUTE_PATH.key(), file3.getParentFile().getAbsolutePath() + "/");
+ break;
+ }
+ }
assertEquals(3, successFiles1.size());
// exclude hidden
@@ -492,7 +510,8 @@ public class TestListFile {
final Path file1Path = file1.toPath();
final Path directoryPath = new File(TESTDIR).toPath();
final Path relativePath = directoryPath.relativize(file1.toPath().getParent());
- String relativePathString = relativePath.toString() + "/";
+ String relativePathString = relativePath.toString();
+ relativePathString = relativePathString.isEmpty() ? "./" : relativePathString + "/";
final Path absolutePath = file1.toPath().toAbsolutePath();
final String absolutePathString = absolutePath.getParent().toString() + "/";
final FileStore store = Files.getFileStore(file1Path);
@@ -575,54 +594,4 @@ public class TestListFile {
}
}
}
-
- private String perms2string(final String permissions) {
- final StringBuilder sb = new StringBuilder();
- if (permissions.contains(PosixFilePermission.OWNER_READ.toString())) {
- sb.append("r");
- } else {
- sb.append("-");
- }
- if (permissions.contains(PosixFilePermission.OWNER_WRITE.toString())) {
- sb.append("w");
- } else {
- sb.append("-");
- }
- if (permissions.contains(PosixFilePermission.OWNER_EXECUTE.toString())) {
- sb.append("x");
- } else {
- sb.append("-");
- }
- if (permissions.contains(PosixFilePermission.GROUP_READ.toString())) {
- sb.append("r");
- } else {
- sb.append("-");
- }
- if (permissions.contains(PosixFilePermission.GROUP_WRITE.toString())) {
- sb.append("w");
- } else {
- sb.append("-");
- }
- if (permissions.contains(PosixFilePermission.GROUP_EXECUTE.toString())) {
- sb.append("x");
- } else {
- sb.append("-");
- }
- if (permissions.contains(PosixFilePermission.OTHERS_READ.toString())) {
- sb.append("r");
- } else {
- sb.append("-");
- }
- if (permissions.contains(PosixFilePermission.OTHERS_WRITE.toString())) {
- sb.append("w");
- } else {
- sb.append("-");
- }
- if (permissions.contains(PosixFilePermission.OTHERS_EXECUTE.toString())) {
- sb.append("x");
- } else {
- sb.append("-");
- }
- return sb.toString();
- }
}
[3/3] nifi git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/nifi
Posted by ma...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/nifi
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/dce039b5
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/dce039b5
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/dce039b5
Branch: refs/heads/master
Commit: dce039b54f2fa1fbecce5d5d5fac14f54322f32d
Parents: 76914ea 3656c88
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Dec 3 16:35:33 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Dec 3 16:35:33 2015 -0500
----------------------------------------------------------------------
.../nifi/processors/standard/util/PasswordBasedEncryptor.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] nifi git commit: Merge branch 'NIFI-1246'
Posted by ma...@apache.org.
Merge branch 'NIFI-1246'
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/76914ead
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/76914ead
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/76914ead
Branch: refs/heads/master
Commit: 76914ead03bb43c1666b5d3a87ee8ff96b520447
Parents: 6bdcd39 3b7512e
Author: Mark Payne <ma...@hotmail.com>
Authored: Thu Dec 3 16:35:19 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Thu Dec 3 16:35:19 2015 -0500
----------------------------------------------------------------------
.../nifi/processors/standard/ListFile.java | 5 +-
.../nifi/processors/standard/TestListFile.java | 101 +++++++------------
2 files changed, 38 insertions(+), 68 deletions(-)
----------------------------------------------------------------------