Merge pull request #326 from berkeleysquare/javasdk98

Javacli-98 expose ignoreNamingConflicts option through helper

Author: rpmoore

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

@@ -87,7 +87,8 @@ private Ds3ClientHelpers.Job innerStartWriteJob(final String bucket,
                 new PutBulkJobSpectraS3Request(bucket, Lists.newArrayList(objectsToWrite))
                 .withPriority(options.getPriority())
                 .withMaxUploadSize(options.getMaxUploadSize())
-                .withAggregating(options.isAggregating()));
+                .withAggregating(options.isAggregating())
+                .withIgnoreNamingConflicts(options.doIgnoreNamingConflicts()));
         return new WriteJobImpl(this.client, prime.getResult(), this.retryAfter, options.getChecksumType());
     }
 

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

@@ -25,13 +25,15 @@ public class WriteJobOptions {
     private int maxUploadSize;
     private ChecksumType.Type checksumType;
     private boolean aggregating;
+    private boolean ignoreNamingConflicts;
 
     private WriteJobOptions() {
         this.priority = null;
         this.writeOptimization = null;
         this.maxUploadSize = 0;
         this.checksumType = ChecksumType.Type.NONE;
         this.aggregating = false;
+        this.ignoreNamingConflicts = false;
     }
 
     public static WriteJobOptions create() {
@@ -98,4 +100,17 @@ public boolean isAggregating() {
     public void setAggregating(final boolean aggregating) {
         this.aggregating = aggregating;
     }
+
+    public void setIgnoreNamingConflicts(final boolean ignore) {
+        this.ignoreNamingConflicts = ignore;
+    }
+
+    public boolean doIgnoreNamingConflicts() {
+        return ignoreNamingConflicts;
+    }
+
+    public WriteJobOptions withIgnoreNamingConflicts(final boolean ignore) {
+        this.ignoreNamingConflicts = ignore;
+        return this;
+    }
 }