You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2015/02/15 19:28:42 UTC
jclouds git commit: Build S3 multi-delete request with an XML library
Repository: jclouds
Updated Branches:
refs/heads/master c14141dec -> 2553b09bb
Build S3 multi-delete request with an XML library
This commit addresses test failures in
AWSS3BlobIntegrationLiveTest.deleteMultipleObjects.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/2553b09b
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/2553b09b
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/2553b09b
Branch: refs/heads/master
Commit: 2553b09bb46babaeb678b1a51be77b96a84d6a89
Parents: c14141d
Author: Andrew Gaul <ga...@apache.org>
Authored: Sun Feb 15 10:20:20 2015 -0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sun Feb 15 10:25:23 2015 -0800
----------------------------------------------------------------------
.../BindIterableAsPayloadToDeleteRequest.java | 34 +++++++++++++++-----
1 file changed, 26 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/2553b09b/apis/s3/src/main/java/org/jclouds/s3/binders/BindIterableAsPayloadToDeleteRequest.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindIterableAsPayloadToDeleteRequest.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindIterableAsPayloadToDeleteRequest.java
index baa7f56..5a66d2b 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindIterableAsPayloadToDeleteRequest.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindIterableAsPayloadToDeleteRequest.java
@@ -21,7 +21,16 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.hash.Hashing.md5;
+import java.util.Properties;
+
import javax.ws.rs.core.MediaType;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.TransformerException;
+
+import com.google.common.base.Throwables;
+import com.google.common.collect.Iterables;
+import com.jamesmurty.utils.XMLBuilder;
import org.jclouds.http.HttpRequest;
import org.jclouds.io.Payload;
@@ -38,16 +47,25 @@ public class BindIterableAsPayloadToDeleteRequest implements Binder {
checkNotNull(request, "request is null");
Iterable<String> keys = (Iterable<String>) input;
- StringBuilder builder = new StringBuilder();
- for (String key : keys) {
- builder.append(String.format("<Object><Key>%s</Key></Object>", key));
- }
+ checkArgument(!Iterables.isEmpty(keys), "The list of keys should not be empty.");
- final String objects = builder.toString();
- checkArgument(!objects.isEmpty(), "The list of keys should not be empty.");
+ String content;
+ try {
+ XMLBuilder rootBuilder = XMLBuilder.create("Delete");
+ for (String key : keys) {
+ XMLBuilder ownerBuilder = rootBuilder.elem("Object");
+ XMLBuilder keyBuilder = ownerBuilder.elem("Key").text(key);
+ }
- final String content = String.format("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
- "<Delete>%s</Delete>", objects);
+ Properties outputProperties = new Properties();
+ outputProperties.put(OutputKeys.OMIT_XML_DECLARATION, "yes");
+ content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+ rootBuilder.asString(outputProperties);
+ } catch (ParserConfigurationException pce) {
+ throw Throwables.propagate(pce);
+ } catch (TransformerException te) {
+ throw Throwables.propagate(te);
+ }
Payload payload = Payloads.newStringPayload(content);
payload.getContentMetadata().setContentType(MediaType.TEXT_XML);