From b80bb48be3602769f60bf4bdf156cbd41fe0f01d Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Thu, 29 Aug 2013 15:56:16 -0700 Subject: [PATCH] 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. --- .../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(-) 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 65171589bb..f8ad7253d1 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> listDirectories(ListOptions... options); 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 e63c7bd495..2d35c04045 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 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 Invokable method = method(AtmosAsyncClient.class, "listDirectories", ListOptions[].class); GeneratedHttpRequest request = processor.createRequest(method, ImmutableList. 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);