You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2013/08/30 18:08:01 UTC

git commit: Add trailing slash to Atmos listDirectories

Updated Branches:
  refs/heads/master de8ab5707 -> b80bb48be


Add trailing slash to Atmos listDirectories

This is more consistent with examples in the Atmos programmer's guide
and allows this operation to succeed when used with ViPR.


Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/b80bb48b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/b80bb48b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/b80bb48b

Branch: refs/heads/master
Commit: b80bb48be3602769f60bf4bdf156cbd41fe0f01d
Parents: de8ab57
Author: Andrew Gaul <ga...@apache.org>
Authored: Thu Aug 29 15:56:16 2013 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Fri Aug 30 09:07:12 2013 -0700

----------------------------------------------------------------------
 apis/atmos/src/main/java/org/jclouds/atmos/AtmosAsyncClient.java | 1 +
 .../src/test/java/org/jclouds/atmos/AtmosAsyncClientTest.java    | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/b80bb48b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosAsyncClient.java
----------------------------------------------------------------------
diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosAsyncClient.java b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosAsyncClient.java
index 6517158..f8ad725 100644
--- a/apis/atmos/src/main/java/org/jclouds/atmos/AtmosAsyncClient.java
+++ b/apis/atmos/src/main/java/org/jclouds/atmos/AtmosAsyncClient.java
@@ -92,6 +92,7 @@ public interface AtmosAsyncClient extends Closeable {
     */
    @Named("ListDirectory")
    @GET
+   @Path("/")
    @ResponseParser(ParseDirectoryListFromContentAndHeaders.class)
    @Consumes(MediaType.TEXT_XML)
    ListenableFuture<BoundedSet<? extends DirectoryEntry>> listDirectories(ListOptions... options);

http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/b80bb48b/apis/atmos/src/test/java/org/jclouds/atmos/AtmosAsyncClientTest.java
----------------------------------------------------------------------
diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/AtmosAsyncClientTest.java b/apis/atmos/src/test/java/org/jclouds/atmos/AtmosAsyncClientTest.java
index e63c7bd..2d35c04 100644
--- a/apis/atmos/src/test/java/org/jclouds/atmos/AtmosAsyncClientTest.java
+++ b/apis/atmos/src/test/java/org/jclouds/atmos/AtmosAsyncClientTest.java
@@ -71,7 +71,7 @@ public class AtmosAsyncClientTest extends BaseAsyncClientTest<AtmosAsyncClient>
       Invokable<?, ?> method = method(AtmosAsyncClient.class, "listDirectories", ListOptions[].class);
       GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.of());
 
-      assertRequestLineEquals(request, "GET https://accesspoint.atmosonline.com/rest/namespace HTTP/1.1");
+      assertRequestLineEquals(request, "GET https://accesspoint.atmosonline.com/rest/namespace/ HTTP/1.1");
       assertNonPayloadHeadersEqual(request, HttpHeaders.ACCEPT + ": text/xml\n");
       assertPayloadEquals(request, null, null, false);
 
@@ -101,7 +101,7 @@ public class AtmosAsyncClientTest extends BaseAsyncClientTest<AtmosAsyncClient>
       Invokable<?, ?> method = method(AtmosAsyncClient.class, "listDirectories", ListOptions[].class);
       GeneratedHttpRequest request = processor.createRequest(method, ImmutableList.<Object> of(new ListOptions().limit(1).token("asda")));
 
-      assertRequestLineEquals(request, "GET https://accesspoint.atmosonline.com/rest/namespace HTTP/1.1");
+      assertRequestLineEquals(request, "GET https://accesspoint.atmosonline.com/rest/namespace/ HTTP/1.1");
       assertNonPayloadHeadersEqual(request, HttpHeaders.ACCEPT + ": text/xml\nx-emc-limit: 1\nx-emc-token: asda\n");
       assertPayloadEquals(request, null, null, false);