Merge pull request #78 from eugenp/master

update
This commit is contained in:
Maiklins 2020-12-30 12:40:12 +01:00 committed by GitHub
commit 918057ed1b
17 changed files with 19 additions and 4 deletions

View File

@ -24,9 +24,20 @@ public class ListFiles {
.collect(Collectors.toSet());
}
public Set<String> listFilesUsingFilesList(String dir) throws IOException {
try (Stream<Path> stream = Files.list(Paths.get(dir))) {
return stream
.filter(file -> !Files.isDirectory(file))
.map(Path::getFileName)
.map(Path::toString)
.collect(Collectors.toSet());
}
}
public Set<String> listFilesUsingFileWalk(String dir, int depth) throws IOException {
try (Stream<Path> stream = Files.walk(Paths.get(dir), depth)) {
return stream.filter(file -> !Files.isDirectory(file))
return stream
.filter(file -> !Files.isDirectory(file))
.map(Path::getFileName)
.map(Path::toString)
.collect(Collectors.toSet());

View File

@ -25,10 +25,15 @@ public class ListFilesUnitTest {
};
@Test
public void givenDir_whenUsingJAVAIO_thenListAllFiles() throws IOException {
public void givenDir_whenUsingJAVAIO_thenListAllFiles() {
assertEquals(EXPECTED_FILE_LIST, listFiles.listFilesUsingJavaIO(DIRECTORY));
}
@Test
public void givenDir_whenUsingFilesList_thenListAllFiles() throws IOException {
assertEquals(EXPECTED_FILE_LIST, listFiles.listFilesUsingFilesList(DIRECTORY));
}
@Test
public void givenDir_whenWalkingTree_thenListAllFiles() throws IOException {
assertEquals(EXPECTED_FILE_LIST, listFiles.listFilesUsingFileWalk(DIRECTORY,DEPTH));

View File

@ -665,7 +665,6 @@
<module>spring-mvc-velocity</module>
<module>spring-mvc-views</module>
<module>spring-mvc-webflow</module>
<module>spring-mvc-xml</module>
<module>spring-protobuf</module>
@ -1133,7 +1132,6 @@
<module>spring-mvc-velocity</module>
<module>spring-mvc-views</module>
<module>spring-mvc-webflow</module>
<module>spring-mvc-xml</module>
<module>spring-protobuf</module>

View File

@ -20,6 +20,7 @@
<module>spring-mvc-basics-4</module>
<module>spring-mvc-crash</module>
<module>spring-mvc-forms-jsp</module>
<module>spring-mvc-webflow</module>
<module>spring-rest-angular</module>
<module>spring-rest-http</module>
<module>spring-resttemplate-2</module>