Repository: jclouds Updated Branches: refs/heads/master 5e3924947 -> 8bbcfed31
Ensures the Swift container list call requests JSON as per spec Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/8bbcfed3 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/8bbcfed3 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/8bbcfed3 Branch: refs/heads/master Commit: 8bbcfed312f6a19cd89441267f081c900b478c2c Parents: 5e39249 Author: Zack Shoylev <[email protected]> Authored: Thu Feb 18 11:56:59 2016 -0600 Committer: Zack Shoylev <[email protected]> Committed: Thu Feb 18 18:48:55 2016 -0600 ---------------------------------------------------------------------- .../org/jclouds/openstack/swift/v1/features/ContainerApi.java | 2 ++ .../java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java | 3 ++- .../jclouds/openstack/swift/v1/features/ContainerApiMockTest.java | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/8bbcfed3/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java index e9da15b..fdd4555 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ContainerApi.java @@ -46,6 +46,7 @@ import org.jclouds.openstack.swift.v1.options.ListContainerOptions; import org.jclouds.openstack.swift.v1.options.UpdateContainerOptions; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.Fallback; +import org.jclouds.rest.annotations.QueryParams; import org.jclouds.rest.annotations.RequestFilters; import org.jclouds.rest.annotations.ResponseParser; @@ -77,6 +78,7 @@ public interface ContainerApi { @Named("container:list") @GET @Fallback(EmptyFluentIterableOnNotFoundOr404.class) + @QueryParams(keys = "format", values = "json") FluentIterable<Container> list(); /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/8bbcfed3/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java index d1c8829..33e802b 100644 --- a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java +++ b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java @@ -18,6 +18,7 @@ package org.jclouds.openstack.swift.v1; import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static org.assertj.core.api.Assertions.assertThat; import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; @@ -65,7 +66,7 @@ public class TempAuthMockTest { // list request went to the destination specified in X-Storage-Url. RecordedRequest listContainers = swiftServer.takeRequest(); assertEquals(listContainers.getMethod(), "GET"); - assertEquals(listContainers.getPath(), "/"); + assertThat(listContainers.getPath().contains("?format=json")); assertEquals(listContainers.getHeader("Accept"), APPLICATION_JSON); assertEquals(listContainers.getHeader("X-Auth-Token"), "token"); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/8bbcfed3/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java index c158b71..bd568d9 100644 --- a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java +++ b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java @@ -67,7 +67,7 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> { assertEquals(server.getRequestCount(), 2); assertAuthentication(server); - assertRequest(server.takeRequest(), "GET", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9"); + assertRequest(server.takeRequest(), "GET", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9?format=json"); } finally { server.shutdown(); }
