Merge pull request #144 from rpmoore/sym_link

Added logic to the FileObjectPutter to make it aware of symlink files…

Author: shabtaisharon

ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/FileObjectPutter.java

@@ -20,6 +20,7 @@
 import java.io.IOException;
 import java.nio.channels.FileChannel;
 import java.nio.channels.SeekableByteChannel;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 
@@ -39,6 +40,16 @@ public FileObjectPutter(final Path root) {
 
     @Override
     public SeekableByteChannel buildChannel(final String key) throws IOException {
-        return FileChannel.open(this.root.resolve(key), StandardOpenOption.READ);
+
+        final Path path = this.root.resolve(key);
+
+        return FileChannel.open(resolveForSymbolic(path), StandardOpenOption.READ);
+    }
+
+    private static Path resolveForSymbolic(final Path path) throws IOException {
+        if (Files.isSymbolicLink(path)) {
+            return Files.readSymbolicLink(path);
+        }
+        return path;
     }
 }

ds3-sdk/src/test/java/com/spectralogic/ds3client/helpers/FileObjectPutter_Test.java

@@ -0,0 +1,78 @@
+package com.spectralogic.ds3client.helpers;
+
+import org.junit.Test;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.SeekableByteChannel;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertThat;
+
+public class FileObjectPutter_Test {
+
+    final private static String testString = "This is some test data.";
+    final private static byte[] testData = testString.getBytes(Charset.forName("UTF-8"));
+
+    @Test
+    public void testSymlink() throws IOException {
+        final Path tempDir = Files.createTempDirectory("ds3_file_object_putter_");
+        final Path tempPath = Files.createTempFile(tempDir, "temp_", ".txt");
+
+        try {
+            try (final SeekableByteChannel channel = Files.newByteChannel(tempPath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE)) {
+                channel.write(ByteBuffer.wrap(testData));
+            }
+
+            final Path symLinkPath = tempDir.resolve("sym_" + tempPath.getFileName().toString());
+            Files.createSymbolicLink(symLinkPath, tempPath);
+
+            try {
+                final FileObjectPutter putter = new FileObjectPutter(tempDir);
+
+                final SeekableByteChannel newChannel = putter.buildChannel(symLinkPath.getFileName().toString());
+                assertThat(newChannel, is(notNullValue()));
+
+                final ByteBuffer buff = ByteBuffer.allocate(testData.length);
+                assertThat(newChannel.read(buff), is(testData.length));
+
+                assertThat(new String(buff.array(), Charset.forName("UTF-8")), is(testString));
+            } finally {
+                Files.deleteIfExists(symLinkPath);
+            }
+        } finally {
+            Files.deleteIfExists(tempPath);
+            Files.deleteIfExists(tempDir);
+        }
+    }
+
+    @Test
+    public void testRegularFile() throws IOException {
+        final Path tempDir = Files.createTempDirectory("ds3_file_object_putter_");
+        final Path tempPath = Files.createTempFile(tempDir, "temp_", ".txt");
+
+        try {
+            try (final SeekableByteChannel channel = Files.newByteChannel(tempPath, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.WRITE)) {
+                channel.write(ByteBuffer.wrap(testData));
+            }
+            final FileObjectPutter putter = new FileObjectPutter(tempDir);
+
+            final SeekableByteChannel newChannel = putter.buildChannel(tempPath.getFileName().toString());
+            assertThat(newChannel, is(notNullValue()));
+
+            final ByteBuffer buff = ByteBuffer.allocate(testData.length);
+            assertThat(newChannel.read(buff), is(testData.length));
+
+            assertThat(new String(buff.array(), Charset.forName("UTF-8")), is(testString));
+
+        } finally {
+            Files.deleteIfExists(tempPath);
+            Files.deleteIfExists(tempDir);
+        }
+    }
+}