From 0546b41e3aea7116acaf02363d07fcd3b35774dc Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 22 Aug 2016 13:19:50 -0600 Subject: [PATCH 1/2] JAVACLI-98 expose ignoreNamingConflicts option through helper. --- .../ds3client/helpers/Ds3ClientHelpersImpl.java | 3 ++- .../helpers/options/WriteJobOptions.java | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/Ds3ClientHelpersImpl.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/Ds3ClientHelpersImpl.java index 0aa74839d..b021a6c75 100644 --- a/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/Ds3ClientHelpersImpl.java +++ b/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()); } diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/options/WriteJobOptions.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/options/WriteJobOptions.java index 040b3f17d..cf5216346 100644 --- a/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/options/WriteJobOptions.java +++ b/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/options/WriteJobOptions.java @@ -25,6 +25,7 @@ public class WriteJobOptions { private int maxUploadSize; private ChecksumType.Type checksumType; private boolean aggregating; + private boolean ignoreNamingConflicts; private WriteJobOptions() { this.priority = null; @@ -32,6 +33,7 @@ private WriteJobOptions() { 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() { + this.ignoreNamingConflicts = true; + return this; + } } From 0fdf5d408e90cc9e4d469bd486b8b9673f7815b1 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 22 Aug 2016 14:00:43 -0600 Subject: [PATCH 2/2] JAVACLI-98 expose ignoreNamingConflicts option through helper. --- .../ds3client/helpers/options/WriteJobOptions.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/options/WriteJobOptions.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/options/WriteJobOptions.java index cf5216346..7c53980e9 100644 --- a/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/options/WriteJobOptions.java +++ b/ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/options/WriteJobOptions.java @@ -109,8 +109,8 @@ public boolean doIgnoreNamingConflicts() { return ignoreNamingConflicts; } - public WriteJobOptions withIgnoreNamingConflicts() { - this.ignoreNamingConflicts = true; + public WriteJobOptions withIgnoreNamingConflicts(final boolean ignore) { + this.ignoreNamingConflicts = ignore; return this; } }