Merge pull request #439 from treasure-data/put-delete-query-params

Add query parameters to delete and put options for large objects

Author: gondor

core/src/main/java/org/openstack4j/api/storage/ObjectStorageObjectService.java

@@ -11,6 +11,7 @@
 import org.openstack4j.model.storage.object.SwiftObject;
 import org.openstack4j.model.storage.object.options.ObjectListOptions;
 import org.openstack4j.model.storage.object.options.ObjectLocation;
+import org.openstack4j.model.storage.object.options.ObjectDeleteOptions;
 import org.openstack4j.model.storage.object.options.ObjectPutOptions;
 
 /**
@@ -121,6 +122,15 @@ public interface ObjectStorageObjectService extends RestService {
      */
     ActionResponse delete(ObjectLocation location);
 
+    /**
+     * Deletes an Object from the specified container
+     * 
+     * @param location location containing container name and object name
+     * @param options the deleting options
+     * @return the action response
+     */
+    ActionResponse delete(ObjectLocation location, ObjectDeleteOptions options);
+    
     /**
      * Copies an object to another object in the object store
      * 

core/src/main/java/org/openstack4j/model/storage/object/options/ObjectDeleteOptions.java

@@ -0,0 +1,42 @@
+package org.openstack4j.model.storage.object.options;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import com.google.common.collect.Maps;
+
+/**
+ * Options used for the deletion of Objects
+ */
+public final class ObjectDeleteOptions {
+
+    public static final ObjectDeleteOptions NONE = new ObjectDeleteOptions();
+
+    private Map<String, List<Object>> queryParams = Maps.newHashMap();
+
+    private ObjectDeleteOptions() { }
+
+    public static ObjectDeleteOptions create() {
+        return new ObjectDeleteOptions();
+    }
+
+    public ObjectDeleteOptions queryParam(String key, Object value) {
+        if (value == null)
+            return this;
+
+        if (queryParams.containsKey(key)) {
+            List<Object> list = queryParams.get(key);
+            list.add(value);
+        } else {
+            List<Object> list = new ArrayList<Object>();
+            list.add(value);
+            queryParams.put(key, list);
+        }
+        return this;
+    }
+
+    public Map<String, List<Object>> getQueryParams() {
+        return queryParams;
+    }
+}

core/src/main/java/org/openstack4j/model/storage/object/options/ObjectPutOptions.java

@@ -3,6 +3,8 @@
 import static org.openstack4j.model.storage.object.SwiftHeaders.OBJECT_METADATA_PREFIX;
 import static org.openstack4j.model.storage.object.SwiftHeaders.CONTENT_TYPE;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 import org.openstack4j.openstack.storage.object.functions.MetadataToHeadersFunction;
@@ -18,6 +20,7 @@ public final class ObjectPutOptions {
 
     public static final ObjectPutOptions NONE = new ObjectPutOptions();
     Map<String, String> headers = Maps.newHashMap();
+    private Map<String, List<Object>> queryParams = Maps.newHashMap();
     private String path;
 
     private ObjectPutOptions() { }
@@ -65,4 +68,23 @@ public String getContentType() {
     public String getPath() {
         return path;
     }
+    
+    public ObjectPutOptions queryParam(String key, Object value) {
+        if (value == null)
+            return this;
+
+        if (queryParams.containsKey(key)) {
+            List<Object> list = queryParams.get(key);
+            list.add(value);
+        } else {
+            List<Object> list = new ArrayList<Object>();
+            list.add(value);
+            queryParams.put(key, list);
+        }
+        return this;
+    }
+    
+    public Map<String, List<Object>> getQueryParams() {
+        return queryParams;
+    }
 }

core/src/main/java/org/openstack4j/openstack/internal/BaseOpenStackService.java

@@ -122,6 +122,15 @@ public Invocation<R> param(boolean condition, String name, Object value) {
             return this;
         }
 
+        public Invocation<R> paramLists(Map<String, ? extends Iterable<? extends Object>> params) {
+            if (params != null) {
+                for (Map.Entry<String, ? extends Iterable<? extends Object>> pair : params.entrySet())
+                    for (Object value : pair.getValue())
+                        req.queryParam(pair.getKey(), value);
+            }
+            return this;
+        }
+
         public Invocation<R> serviceType(ServiceType serviceType) {
             req.serviceType(serviceType);
             return this;

core/src/main/java/org/openstack4j/openstack/storage/object/internal/ObjectStorageObjectServiceImpl.java

@@ -21,6 +21,7 @@
 import org.openstack4j.model.storage.object.SwiftObject;
 import org.openstack4j.model.storage.object.options.ObjectListOptions;
 import org.openstack4j.model.storage.object.options.ObjectLocation;
+import org.openstack4j.model.storage.object.options.ObjectDeleteOptions;
 import org.openstack4j.model.storage.object.options.ObjectPutOptions;
 import org.openstack4j.openstack.common.DLPayloadEntity;
 import org.openstack4j.openstack.common.functions.HeaderNameValuesToHeaderMap;
@@ -126,6 +127,7 @@ public String put(String containerName, String name, Payload<?> payload, ObjectP
                               .entity(payload)
                               .headers(options.getOptions())
                               .contentType(options.getContentType())
+                              .paramLists(options.getQueryParams())
                               .executeWithResponse();
         try
         {
@@ -146,8 +148,16 @@ public ActionResponse delete(String containerName, String name) {
 
     @Override
     public ActionResponse delete(ObjectLocation location) {
+        return delete(location, ObjectDeleteOptions.NONE);
+    }
+
+    @Override
+    public ActionResponse delete(ObjectLocation location, ObjectDeleteOptions options) {
         checkNotNull(location);
-        return deleteWithResponse(location.getURI()).execute();
+        checkNotNull(options);
+        return delete(ActionResponse.class, location.getURI())
+            .paramLists(options.getQueryParams())
+            .execute();
     }
 
     /**