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/07 21:13:21 UTC
[1/2] nifi git commit: NIFI-1261: Use consistent file separators for
ListFile / TestListFile based on what the Operating System uses
Repository: nifi
Updated Branches:
refs/heads/master 1f4ef9f5f -> 46623c2bf
NIFI-1261: Use consistent file separators for ListFile / TestListFile based on what the Operating System uses
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/bfe6fad5
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/bfe6fad5
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/bfe6fad5
Branch: refs/heads/master
Commit: bfe6fad502a30e5b4dbf0973f7c696d7161e4e7d
Parents: f83e6d3
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon Dec 7 10:19:49 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon Dec 7 10:19:49 2015 -0500
----------------------------------------------------------------------
.../apache/nifi/processors/standard/ListFile.java | 4 ++--
.../nifi/processors/standard/TestListFile.java | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/bfe6fad5/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 30f4958..c9f4482 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
@@ -222,10 +222,10 @@ public class ListFile extends AbstractListProcessor<FileInfo> {
final Path relativePath = directoryPath.toAbsolutePath().relativize(filePath.getParent());
String relativePathString = relativePath.toString();
- relativePathString = relativePathString.isEmpty() ? "./" : relativePathString + "/";
+ relativePathString = relativePathString.isEmpty() ? "." + File.separator : relativePathString + File.separator;
final Path absPath = filePath.toAbsolutePath();
- final String absPathString = absPath.getParent().toString() + "/";
+ final String absPathString = absPath.getParent().toString() + File.separator;
attributes.put(CoreAttributes.PATH.key(), relativePathString);
attributes.put(CoreAttributes.FILENAME.key(), fileInfo.getFileName());
http://git-wip-us.apache.org/repos/asf/nifi/blob/bfe6fad5/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 4ae7714..9fd7a3d 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
@@ -430,16 +430,16 @@ public class TestListFile {
switch (filename) {
case "file1.txt":
- assertEquals("./", path);
- mff.assertAttributeEquals(CoreAttributes.ABSOLUTE_PATH.key(), file1.getParentFile().getAbsolutePath() + "/");
+ assertEquals("." + File.separator, path);
+ mff.assertAttributeEquals(CoreAttributes.ABSOLUTE_PATH.key(), file1.getParentFile().getAbsolutePath() + File.separator);
break;
case "file2.txt":
- assertEquals("subdir1/", path);
- mff.assertAttributeEquals(CoreAttributes.ABSOLUTE_PATH.key(), file2.getParentFile().getAbsolutePath() + "/");
+ assertEquals("subdir1" + File.separator, path);
+ mff.assertAttributeEquals(CoreAttributes.ABSOLUTE_PATH.key(), file2.getParentFile().getAbsolutePath() + File.separator);
break;
case "file3.txt":
- assertEquals("subdir1/subdir2/", path);
- mff.assertAttributeEquals(CoreAttributes.ABSOLUTE_PATH.key(), file3.getParentFile().getAbsolutePath() + "/");
+ assertEquals("subdir1" + File.separator + "subdir2" + File.separator, path);
+ mff.assertAttributeEquals(CoreAttributes.ABSOLUTE_PATH.key(), file3.getParentFile().getAbsolutePath() + File.separator);
break;
}
}
@@ -511,9 +511,9 @@ public class TestListFile {
final Path directoryPath = new File(TESTDIR).toPath();
final Path relativePath = directoryPath.relativize(file1.toPath().getParent());
String relativePathString = relativePath.toString();
- relativePathString = relativePathString.isEmpty() ? "./" : relativePathString + "/";
+ relativePathString = relativePathString.isEmpty() ? "." + File.separator : relativePathString + File.separator;
final Path absolutePath = file1.toPath().toAbsolutePath();
- final String absolutePathString = absolutePath.getParent().toString() + "/";
+ final String absolutePathString = absolutePath.getParent().toString() + File.separator;
final FileStore store = Files.getFileStore(file1Path);
final DateFormat formatter = new SimpleDateFormat(ListFile.FILE_MODIFY_DATE_ATTR_FORMAT, Locale.US);
final String time3Formatted = formatter.format(time3rounded);
[2/2] nifi git commit: Merge branch 'NIFI-1261'
Posted by ma...@apache.org.
Merge branch 'NIFI-1261'
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/46623c2b
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/46623c2b
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/46623c2b
Branch: refs/heads/master
Commit: 46623c2bf3153c50c9187415a2001ac9b3a26baa
Parents: 1f4ef9f bfe6fad
Author: Mark Payne <ma...@hotmail.com>
Authored: Mon Dec 7 15:13:12 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Mon Dec 7 15:13:12 2015 -0500
----------------------------------------------------------------------
.../apache/nifi/processors/standard/ListFile.java | 4 ++--
.../nifi/processors/standard/TestListFile.java | 16 ++++++++--------
2 files changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------