|
11 | 11 |
|
12 | 12 | package io.vertx.core.file.impl; |
13 | 13 |
|
| 14 | +import io.netty.buffer.ByteBuf; |
| 15 | +import io.netty.buffer.Unpooled; |
14 | 16 | import io.vertx.codegen.annotations.Nullable; |
15 | 17 | import io.vertx.core.Future; |
16 | 18 | import io.vertx.core.buffer.Buffer; |
17 | | -import io.vertx.core.file.AsyncFile; |
18 | | -import io.vertx.core.file.CopyOptions; |
19 | | -import io.vertx.core.file.FileProps; |
| 19 | +import io.vertx.core.buffer.impl.BufferImpl; |
| 20 | +import io.vertx.core.file.*; |
20 | 21 | import io.vertx.core.file.FileSystem; |
21 | 22 | import io.vertx.core.file.FileSystemException; |
22 | | -import io.vertx.core.file.FileSystemProps; |
23 | | -import io.vertx.core.file.OpenOptions; |
24 | 23 | import io.vertx.core.internal.ContextInternal; |
25 | 24 | import io.vertx.core.internal.VertxInternal; |
26 | 25 |
|
27 | 26 | import java.io.File; |
28 | 27 | import java.io.FilenameFilter; |
29 | 28 | import java.io.IOException; |
30 | 29 | import java.io.RandomAccessFile; |
31 | | -import java.nio.file.CopyOption; |
32 | | -import java.nio.file.FileAlreadyExistsException; |
33 | | -import java.nio.file.FileStore; |
34 | | -import java.nio.file.FileVisitOption; |
35 | | -import java.nio.file.FileVisitResult; |
36 | | -import java.nio.file.Files; |
37 | | -import java.nio.file.LinkOption; |
38 | | -import java.nio.file.Path; |
39 | | -import java.nio.file.Paths; |
40 | | -import java.nio.file.SimpleFileVisitor; |
41 | | -import java.nio.file.StandardCopyOption; |
42 | | -import java.nio.file.attribute.BasicFileAttributes; |
43 | | -import java.nio.file.attribute.FileAttribute; |
44 | | -import java.nio.file.attribute.GroupPrincipal; |
45 | | -import java.nio.file.attribute.PosixFileAttributeView; |
46 | | -import java.nio.file.attribute.PosixFilePermission; |
47 | | -import java.nio.file.attribute.PosixFilePermissions; |
48 | | -import java.nio.file.attribute.UserPrincipal; |
49 | | -import java.nio.file.attribute.UserPrincipalLookupService; |
50 | | -import java.util.ArrayList; |
51 | | -import java.util.EnumSet; |
52 | | -import java.util.HashSet; |
53 | | -import java.util.List; |
54 | | -import java.util.Objects; |
55 | | -import java.util.Set; |
| 30 | +import java.nio.file.*; |
| 31 | +import java.nio.file.attribute.*; |
| 32 | +import java.util.*; |
56 | 33 | import java.util.concurrent.Callable; |
57 | 34 | import java.util.regex.Pattern; |
58 | 35 |
|
59 | 36 | /** |
60 | | - * |
61 | 37 | * This class is thread-safe |
62 | 38 | * |
63 | 39 | * @author <a href="http://tfox.org">Tim Fox</a> |
@@ -531,7 +507,7 @@ public Void perform() { |
531 | 507 | raf.setLength(len); |
532 | 508 | } |
533 | 509 | } catch (IOException e) { |
534 | | - throw new FileSystemException(getFileAccessErrorMessage("truncate", p) ,e); |
| 510 | + throw new FileSystemException(getFileAccessErrorMessage("truncate", p), e); |
535 | 511 | } |
536 | 512 | return null; |
537 | 513 | } |
@@ -711,6 +687,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IO |
711 | 687 | Files.delete(file); |
712 | 688 | return FileVisitResult.CONTINUE; |
713 | 689 | } |
| 690 | + |
714 | 691 | public FileVisitResult postVisitDirectory(Path dir, IOException e) throws IOException { |
715 | 692 | if (e == null) { |
716 | 693 | Files.delete(dir); |
@@ -876,7 +853,8 @@ public Buffer perform() { |
876 | 853 | try { |
877 | 854 | Path target = resolveFile(path).toPath(); |
878 | 855 | byte[] bytes = Files.readAllBytes(target); |
879 | | - return Buffer.buffer(bytes); |
| 856 | + ByteBuf bb = Unpooled.wrappedBuffer(bytes); |
| 857 | + return new BufferImpl(bb); |
880 | 858 | } catch (IOException e) { |
881 | 859 | throw new FileSystemException(getFileAccessErrorMessage("read", path), e); |
882 | 860 | } |
|
0 commit comments