Adding the max_upload_size to the bulk put request. Also added the option to the WriteJobOptions so it can be set when using the bulk put helper function

Author: rpmoore

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/BulkPutRequest.java

@@ -24,9 +24,13 @@
 import java.util.List;
 
 public class BulkPutRequest extends BulkRequest {
+
+    private static final String MAX_UPLOAD_SIZE_IN_BYTES = "100000000000";
+    public static final int MIN_UPLOAD_SIZE_IN_BYTES = 10485760;
+
     public BulkPutRequest(final String bucket, final List<Ds3Object> objects) throws XmlProcessingException {
         super(bucket, objects);
-        getQueryParams().put("operation", "start_bulk_put");
+        this.getQueryParams().put("operation", "start_bulk_put");
     }
 
     @Override
@@ -35,6 +39,21 @@ public BulkPutRequest withPriority(final Priority priority) {
         return this;
     }
 
+    /**
+     * Sets the chunk size for this job.
+     * @param size The chunk size in bytes.  If the value passed in is less than MIN_UPLOAD_SIZE_IN_BYTES, then
+     *             the default size will be used.
+     */
+    public BulkPutRequest withMaxUploadSize(final int size) {
+        if (size > MIN_UPLOAD_SIZE_IN_BYTES) {
+            this.getQueryParams().put("max_upload_size", Long.toString(size));
+        }
+        else {
+            this.getQueryParams().put("max_upload_size", MAX_UPLOAD_SIZE_IN_BYTES);
+        }
+        return this;
+    }
+
     @Override
     public BulkPutRequest withWriteOptimization(final WriteOptimization writeOptimization) {
         super.withWriteOptimization(writeOptimization);

ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/Ds3ClientHelpersImpl.java

@@ -69,7 +69,8 @@ private Ds3ClientHelpers.Job innerStartWriteJob(final String bucket,
             throws SignatureException, IOException, XmlProcessingException {
         final BulkPutResponse prime = this.client.bulkPut(new BulkPutRequest(bucket, Lists.newArrayList(objectsToWrite))
                 .withPriority(options.getPriority())
-                .withWriteOptimization(options.getWriteOptimization()));
+                .withWriteOptimization(options.getWriteOptimization())
+                .withMaxUploadSize(options.getMaxUploadSize()));
         return new WriteJobImpl(this.client, prime.getResult());
     }
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/options/WriteJobOptions.java

@@ -21,16 +21,27 @@
 public class WriteJobOptions {
     private Priority priority;
     private WriteOptimization writeOptimization;
+    private int maxUploadSize;
 
     private WriteJobOptions() {
         this.priority = null;
         this.writeOptimization = null;
+        this.maxUploadSize = 0;
     }
 
     public static WriteJobOptions create() {
         return new WriteJobOptions();
     }
 
+    public WriteJobOptions withMaxUploadSize(final int maxUploadSize) {
+        this.maxUploadSize = maxUploadSize;
+        return this;
+    }
+
+    public int getMaxUploadSize() {
+        return this.maxUploadSize;
+    }
+
     public WriteJobOptions withWriteOptimization(final WriteOptimization writeOptimization) {
         this.writeOptimization = writeOptimization;
         return this;