You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2014/05/15 16:07:58 UTC
[1/2] git commit: Revert "Fixes a bug with swift where the metadata
is updated,
but the content-type is reset to application/x-www-form-urlencoded."
Repository: jclouds-labs-openstack
Updated Branches:
refs/heads/master 8775b1339 -> 762899a0e
Revert "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 a68c407b414ff361e8201056482134474188770d.
Issue number missing from the 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/0273eb31
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/0273eb31
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/0273eb31
Branch: refs/heads/master
Commit: 0273eb31499c616757667930bd1a9fafeda44e5c
Parents: 8775b13
Author: Andrew Phillips <an...@apache.org>
Authored: Wed May 14 08:53:36 2014 -0400
Committer: Andrew Phillips <an...@apache.org>
Committed: Thu May 15 09:59:16 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/0273eb31/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 665fa37..0320542 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;
@@ -177,7 +176,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/0273eb31/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"))));
[2/2] git commit: JCLOUDS-565: Fixes a bug with swift where the
metadata is updated,
but the content-type is reset to application/x-www-form-urlencoded.
Posted by an...@apache.org.
JCLOUDS-565: Fixes a bug with swift where the metadata is updated, but the content-type is reset to application/x-www-form-urlencoded.
Workaround: send an empty Content-Type header, only for the updateMetadata call.
Re-commit of a68c407b4 with issue number.
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/762899a0
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/762899a0
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/762899a0
Branch: refs/heads/master
Commit: 762899a0e39aa156db4aa6b43a5283204591163b
Parents: 0273eb3
Author: Zack Shoylev <za...@rackspace.com>
Authored: Mon May 12 23:15:08 2014 -0500
Committer: Andrew Phillips <an...@apache.org>
Committed: Thu May 15 09:59:17 2014 -0400
----------------------------------------------------------------------
.../openstack/swift/v1/features/ObjectApi.java | 2 ++
.../swift/v1/features/ObjectApiMockTest.java | 27 ++++++++++++++++++++
2 files changed, 29 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/762899a0/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 0320542..665fa37 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,6 +30,7 @@ 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;
@@ -176,6 +177,7 @@ 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/762899a0/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 7fe10b7..276a5e0 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,6 +256,33 @@ 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"))));