Repository: jclouds-labs-openstack Updated Branches: refs/heads/1.7.x ac117fc3d -> 0ab7dcbf7
Revert "jclouds-565 Fixes a bug with swift where the metadata is updated, but the content-type is reset to application/x-www-form-urlencoded." This reverts commit ac117fc3d85a02625b72e4831617e5d68d4fa376. Issue number incorrectly specified in commit message. Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/aae382f2 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/aae382f2 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/aae382f2 Branch: refs/heads/1.7.x Commit: aae382f20992cfab2ceabb475c8f74e03ed3b93b Parents: ac117fc Author: Andrew Phillips <[email protected]> Authored: Wed May 14 08:57:00 2014 -0400 Committer: Andrew Phillips <[email protected]> Committed: Wed May 14 08:57:00 2014 -0400 ---------------------------------------------------------------------- .../openstack/swift/v1/features/ObjectApi.java | 2 -- .../swift/v1/features/ObjectApiMockTest.java | 27 -------------------- 2 files changed, 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/aae382f2/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java index 4c442fd..e56de7d 100644 --- a/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java +++ b/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/features/ObjectApi.java @@ -30,7 +30,6 @@ import javax.ws.rs.POST; import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; import org.jclouds.Fallbacks.FalseOnNotFoundOr404; import org.jclouds.Fallbacks.NullOnNotFoundOr404; @@ -174,7 +173,6 @@ public interface ObjectApi { @POST @Fallback(FalseOnNotFoundOr404.class) @Path("/{objectName}") - @Produces("") boolean updateMetadata(@PathParam("objectName") String objectName, @BinderParam(BindObjectMetadataToHeaders.class) Map<String, String> metadata); http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/aae382f2/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java index 276a5e0..7fe10b7 100644 --- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java +++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java @@ -256,33 +256,6 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } } - public void testUpdateMetadataContentType() throws Exception { - MockWebServer server = mockOpenStackServer(); - server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json")))); - server.enqueue(addCommonHeaders(objectResponse() - .addHeader(OBJECT_METADATA_PREFIX + "ApiName", "swift") - .addHeader(OBJECT_METADATA_PREFIX + "ApiVersion", "v1.1"))); - - try { - SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); - assertTrue(api.objectApiInRegionForContainer("DFW", "myContainer").updateMetadata("myObject", metadata)); - - assertEquals(server.getRequestCount(), 2); - assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1"); - RecordedRequest replaceRequest = server.takeRequest(); - assertEquals(replaceRequest.getHeaders("Content-Type").get(0), "", "updateMetadata should send an empty content-type header, but sent " - + replaceRequest.getHeaders("Content-Type").get(0).toString()); - - assertEquals(replaceRequest.getRequestLine(), - "POST /v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/myContainer/myObject HTTP/1.1"); - for (Entry<String, String> entry : metadata.entrySet()) { - assertEquals(replaceRequest.getHeader(OBJECT_METADATA_PREFIX + entry.getKey().toLowerCase()), entry.getValue()); - } - } finally { - server.shutdown(); - } - } - public void deleteMetadata() throws Exception { MockWebServer server = mockOpenStackServer(); server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
