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 30f495864c..c9f4482a99 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 { 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()); 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 4ae771459b..9fd7a3dc68 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);