Updated Branches: refs/heads/1.6.x 6add9da5a -> 8e16ecb3e
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/8e16ecb3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/8e16ecb3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/8e16ecb3 Branch: refs/heads/1.6.x Commit: 8e16ecb3ec22b31f6848d7c1fc19851a7739dcb8 Parents: 6add9da Author: Andrew Gaul <[email protected]> Authored: Thu Aug 29 15:56:16 2013 -0700 Committer: Andrew Gaul <[email protected]> Committed: Fri Aug 30 09:08:13 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/8e16ecb3/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/8e16ecb3/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);
