From 1391d8c9c10a84a4d0fae2a466f6cb9c8d16b53d Mon Sep 17 00:00:00 2001 From: Richard North Date: Sun, 26 Nov 2017 12:16:03 +0000 Subject: [PATCH] Fix #493: Use null to indicate no overriding file mode instead of `-1` Eliminate use of a `0` default parameter that was introduced by mistake --- .../images/builder/traits/FilesTrait.java | 8 ++++---- .../testcontainers/utility/MountableFile.java | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/src/main/java/org/testcontainers/images/builder/traits/FilesTrait.java b/core/src/main/java/org/testcontainers/images/builder/traits/FilesTrait.java index 26ef980c25b..61524b59f8a 100644 --- a/core/src/main/java/org/testcontainers/images/builder/traits/FilesTrait.java +++ b/core/src/main/java/org/testcontainers/images/builder/traits/FilesTrait.java @@ -18,7 +18,7 @@ public interface FilesTrait & BuildContextBuilderT * @return self */ default SELF withFileFromFile(String path, File file) { - return withFileFromPath(path, file.toPath(), 0); + return withFileFromPath(path, file.toPath(), null); } /** @@ -28,7 +28,7 @@ default SELF withFileFromFile(String path, File file) { * @return self */ default SELF withFileFromPath(String path, Path filePath) { - return withFileFromPath(path, filePath, 0); + return withFileFromPath(path, filePath, null); } /** @@ -38,7 +38,7 @@ default SELF withFileFromPath(String path, Path filePath) { * @param mode octal value of posix file mode (000..777) * @return self */ - default SELF withFileFromFile(String path, File file, int mode) { + default SELF withFileFromFile(String path, File file, Integer mode) { return withFileFromPath(path, file.toPath(), mode); } @@ -49,7 +49,7 @@ default SELF withFileFromFile(String path, File file, int mode) { * @param mode octal value of posix file mode (000..777) * @return self */ - default SELF withFileFromPath(String path, Path filePath, int mode) { + default SELF withFileFromPath(String path, Path filePath, Integer mode) { final MountableFile mountableFile = MountableFile.forHostPath(filePath, mode); return ((SELF) this).withFileFromTransferable(path, mountableFile); } diff --git a/core/src/main/java/org/testcontainers/utility/MountableFile.java b/core/src/main/java/org/testcontainers/utility/MountableFile.java index ac07c0230f5..f92b8b4e887 100644 --- a/core/src/main/java/org/testcontainers/utility/MountableFile.java +++ b/core/src/main/java/org/testcontainers/utility/MountableFile.java @@ -42,7 +42,7 @@ public class MountableFile implements Transferable { private static final int BASE_DIR_MODE = 0040000; private final String path; - private final int forcedFileMode; + private final Integer forcedFileMode; @Getter(lazy = true) private final String resolvedPath = resolvePath(); @@ -59,7 +59,7 @@ public class MountableFile implements Transferable { * @return a {@link MountableFile} that may be used to obtain a mountable path */ public static MountableFile forClasspathResource(@NotNull final String resourceName) { - return forClasspathResource(resourceName, -1); + return forClasspathResource(resourceName, null); } /** @@ -69,7 +69,7 @@ public static MountableFile forClasspathResource(@NotNull final String resourceN * @return a {@link MountableFile} that may be used to obtain a mountable path */ public static MountableFile forHostPath(@NotNull final String path) { - return forHostPath(path, -1); + return forHostPath(path, null); } /** @@ -79,7 +79,7 @@ public static MountableFile forHostPath(@NotNull final String path) { * @return a {@link MountableFile} that may be used to obtain a mountable path */ public static MountableFile forHostPath(final Path path) { - return forHostPath(path, -1); + return forHostPath(path, null); } /** @@ -89,7 +89,7 @@ public static MountableFile forHostPath(final Path path) { * @param mode octal value of posix file mode (000..777) * @return a {@link MountableFile} that may be used to obtain a mountable path */ - public static MountableFile forClasspathResource(@NotNull final String resourceName, int mode) { + public static MountableFile forClasspathResource(@NotNull final String resourceName, Integer mode) { return new MountableFile(getClasspathResource(resourceName, new HashSet<>()).toString(), mode); } @@ -100,7 +100,7 @@ public static MountableFile forClasspathResource(@NotNull final String resourceN * @param mode octal value of posix file mode (000..777) * @return a {@link MountableFile} that may be used to obtain a mountable path */ - public static MountableFile forHostPath(@NotNull final String path, int mode) { + public static MountableFile forHostPath(@NotNull final String path, Integer mode) { return new MountableFile(new File(path).toURI().toString(), mode); } @@ -111,7 +111,7 @@ public static MountableFile forHostPath(@NotNull final String path, int mode) { * @param mode octal value of posix file mode (000..777) * @return a {@link MountableFile} that may be used to obtain a mountable path */ - public static MountableFile forHostPath(final Path path, int mode) { + public static MountableFile forHostPath(final Path path, Integer mode) { return new MountableFile(path.toAbsolutePath().toString(), mode); } @@ -345,7 +345,7 @@ public int getFileMode() { private int getUnixFileMode(final String pathAsString) { final Path path = Paths.get(pathAsString); - if (this.forcedFileMode > -1) { + if (this.forcedFileMode != null) { return this.getModeValue(path); }