infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-14 18:03:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

8327046: (fs) Files.walk should be clear that depth-first traversal is pre-order

Browse Source 
Reviewed-by: alanb, gli
This commit is contained in:
Pavel Rappo 2024-03-01 13:48:50 +00:00
parent 98434d6105
commit 012411ad8d
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/java.base/share/classes/java/nio/file/Files.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2024, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -3743,7 +3743,7 @@ public final class Files {
// -- Stream APIs --
/**
* Return a lazily populated {@code Stream}, the elements of
* Returns a lazily populated {@code Stream}, the elements of
* which are the entries in the directory. The listing is not recursive.
*
* <p> The elements of the stream are {@link Path} objects that are
@ -3834,11 +3834,12 @@ public final class Files {
}
/**
* Return a {@code Stream} that is lazily populated with {@code
* Returns a {@code Stream} that is lazily populated with {@code
* Path} by walking the file tree rooted at a given starting file. The
* file tree is traversed <em>depth-first</em>, the elements in the stream
* are {@link Path} objects that are obtained as if by {@link
* Path#resolve(Path) resolving} the relative path against {@code start}.
* file tree is traversed <em>depth-first</em> with a directory visited
* before the entries in that directory. The elements in the stream are
* {@link Path} objects that are obtained as if by {@link Path#resolve(Path)
* resolving} the relative path against {@code start}.
*
* <p> The {@code stream} walks the file tree as elements are consumed.
* The {@code Stream} returned is guaranteed to have at least one
@ -3933,11 +3934,12 @@ public final class Files {
}
/**
* Return a {@code Stream} that is lazily populated with {@code
* Returns a {@code Stream} that is lazily populated with {@code
* Path} by walking the file tree rooted at a given starting file. The
* file tree is traversed <em>depth-first</em>, the elements in the stream
* are {@link Path} objects that are obtained as if by {@link
* Path#resolve(Path) resolving} the relative path against {@code start}.
* file tree is traversed <em>depth-first</em> with a directory visited
* before the entries in that directory. The elements in the stream are
* {@link Path} objects that are obtained as if by {@link Path#resolve(Path)
* resolving} the relative path against {@code start}.
*
* <p> This method works as if invoking it were equivalent to evaluating the
* expression:
@ -3978,7 +3980,7 @@ public final class Files {
}
/**
* Return a {@code Stream} that is lazily populated with {@code
* Returns a {@code Stream} that is lazily populated with {@code
* Path} by searching for files in a file tree rooted at a given starting
* file.
*

6
test/jdk/java/nio/file/Files/StreamTest.java
View File

@ -75,7 +75,7 @@ public class StreamTest {
static boolean supportsSymbolicLinks;
static Path[] level1;
static Path[] all;
static Path[] all_folowLinks;
static Path[] allFollowLinks;
@BeforeClass
void setupTestFolder() throws IOException {
@ -130,7 +130,7 @@ public class StreamTest {
tmp = tmp.resolve("lnDir2");
set.add(tmp);
}
all_folowLinks = set.toArray(new Path[0]);
allFollowLinks = set.toArray(new Path[0]);
}
@AfterClass
@ -179,7 +179,7 @@ public class StreamTest {
// We still want to test the behavior with FOLLOW_LINKS option.
try (Stream<Path> s = Files.walk(testFolder, FileVisitOption.FOLLOW_LINKS)) {
Object[] actual = s.sorted().toArray();
assertEquals(actual, all_folowLinks);
assertEquals(actual, allFollowLinks);
} catch (IOException ioe) {
fail("Unexpected IOException");
}