Fix work with relative paths in DataStoreService

Libor Rysavy · Libor Rysavy · commit a46f521e141d · 2014-11-27T08:19:33.000+01:00
diff --git a/src/main/java/com/gooddata/UriPrefixer.java b/src/main/java/com/gooddata/UriPrefixer.java
@@ -5,6 +5,7 @@
 
 import org.springframework.web.util.UriComponentsBuilder;
 
+import java.io.File;
 import java.net.URI;
 
 import static com.gooddata.util.Validate.notEmpty;
@@ -52,8 +53,9 @@ public URI getUriPrefix() {
      */
     public URI mergeUris(URI uri) {
         notNull(uri, "uri");
+        final String path = new File(uriPrefix.getRawPath(), uri.getRawPath()).getAbsolutePath();
         return UriComponentsBuilder.fromUri(uriPrefix)
-                .path(uri.getRawPath())
+                .replacePath(path)
                 .query(uri.getRawQuery())
                 .fragment(uri.getRawFragment())
                 .build().toUri();
diff --git a/src/test/java/com/gooddata/UriPrefixerTest.java b/src/test/java/com/gooddata/UriPrefixerTest.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright (C) 2007-2014, GoodData(R) Corporation. All rights reserved.
+ */
+package com.gooddata;
+
+import org.testng.annotations.Test;
+
+import java.net.URI;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+
+public class UriPrefixerTest {
+
+    @Test
+    public void testMergeUrisWithSlash() throws Exception {
+        final UriPrefixer prefixer = new UriPrefixer("http://localhost:1/uploads");
+        final URI result = prefixer.mergeUris("/test");
+        assertThat(result.toString(), is("http://localhost:1/uploads/test"));
+    }
+
+    @Test
+    public void testMergeUrisWithoutSlash() throws Exception {
+        final UriPrefixer prefixer = new UriPrefixer("http://localhost:1/uploads");
+        final URI result = prefixer.mergeUris("test");
+        assertThat(result.toString(), is("http://localhost:1/uploads/test"));
+    }
+}
diff --git a/src/test/java/com/gooddata/gdc/DataStoreServiceIT.java b/src/test/java/com/gooddata/gdc/DataStoreServiceIT.java
@@ -36,7 +36,7 @@ public void shouldUploadAbsolute() throws Exception {
         gd.getDataStoreService().upload("/test", content);
     }
 
-    @Test(enabled = false) // todo #91
+    @Test
     public void shouldUploadRelative() throws Exception {
         gd.getDataStoreService().upload("test", content);
     }

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public void shouldUploadAbsolute() throws Exception {`
`36`	`36`	`gd.getDataStoreService().upload("/test", content);`
`37`	`37`	`}`
`38`	`38`
`39`		`- @Test(enabled = false) // todo #91`
	`39`	`+ @Test`
`40`	`40`	`public void shouldUploadRelative() throws Exception {`
`41`	`41`	`gd.getDataStoreService().upload("test", content);`
`42`	`42`	`}`