Correcting issue where FileObjectGetter does not respect symlinks

Author: scribe

.gitignore

@@ -18,3 +18,4 @@ atlassian-ide-plugin.xml
 bin/
 *.log
 *.rc
+.DS_Store

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

@@ -44,7 +44,7 @@ public SeekableByteChannel buildChannel(final String key) throws IOException {
         final Path objectPath = this.root.resolve(key);
         final Path parentPath = objectPath.getParent();
         if (parentPath != null) {
-            Files.createDirectories(parentPath);
+            Files.createDirectories(FileUtils.resolveForSymbolic(parentPath));
         }
 
         if ( ! FileUtils.isTransferablePath(objectPath)) {

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

@@ -18,18 +18,26 @@
 import com.spectralogic.ds3client.utils.Platform;
 import org.apache.commons.io.FileUtils;
 import org.junit.Assume;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 
 import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.channels.SeekableByteChannel;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 public class FileObjectGetter_Test {
+    @Rule
+    public TemporaryFolder temporaryFolder = new TemporaryFolder();
+
     @Test
     public void testThatNamedPipeThrows() throws IOException, InterruptedException {
         Assume.assumeFalse(Platform.isWindows());
@@ -77,4 +85,27 @@ public void testThatFileReportsAsRegularOnWindows() throws IOException, Interrup
 
         assertFalse(caughtException.get());
     }
+
+    @Test
+    public void testThatSymbolicLinksAreResolved() {
+        Assume.assumeTrue(Platform.isMac());
+        final String message = "Hello World";
+        final String file = "file.txt";
+        try {
+            final Path tempDirectory = Files.createTempDirectory(Paths.get(System.getProperty("java.io.tmpdir")), "ds3");
+            final Path realDirectory = Files.createDirectory(Paths.get(tempDirectory.toString(), "dir"));
+            final Path symbolicDirectory = Paths.get(tempDirectory.toString(), "symbolic");
+            Files.createSymbolicLink(symbolicDirectory, realDirectory);
+            Files.createFile(Paths.get(realDirectory.toString(), file));
+            final ByteBuffer bb = ByteBuffer.wrap(message.getBytes());
+
+            final SeekableByteChannel getterChannel = new FileObjectGetter(symbolicDirectory).buildChannel(file);
+            getterChannel.write(bb);
+            getterChannel.close();
+            final String content = new String(Files.readAllBytes(Paths.get(realDirectory.toString(), file)));
+            assertTrue(message.equals(content));
+        } catch (final IOException e) {
+            fail("Symbolic links are not handled correctly");
+        }
+    }
 }