Used ChunkClientProcessingOrderGuarantee

* Updated the BulkGetRequest to include ChunkClientProcessingOrderGuarantee.
* Updated the read helpers to set ChunkClientProcessingOrderGuarantee to
  NONE.

Author: Hans-Peter Klett

sdk/src/main/java/com/spectralogic/ds3client/commands/AllocateJobChunkResponse.java

@@ -77,7 +77,11 @@ private static Objects parseChunk(final WebResponse webResponse) throws IOExcept
         }
     }
 
-    private static int parseRetryAfter(final WebResponse response) {
-        return Integer.parseInt(response.getHeaders().get("Retry-After"));
+    private static int parseRetryAfter(final WebResponse webResponse) {
+        final String retryAfter = webResponse.getHeaders().get("Retry-After");
+        if (retryAfter == null) {
+            throw new RetryAfterExpectedException();
+        }
+        return Integer.parseInt(retryAfter);
     }
 }

sdk/src/main/java/com/spectralogic/ds3client/commands/BulkGetRequest.java

@@ -16,6 +16,7 @@
 package com.spectralogic.ds3client.commands;
 
 import com.spectralogic.ds3client.BulkCommand;
+import com.spectralogic.ds3client.models.bulk.ChunkClientProcessingOrderGuarantee;
 import com.spectralogic.ds3client.models.bulk.Ds3Object;
 import com.spectralogic.ds3client.models.bulk.Priority;
 import com.spectralogic.ds3client.models.bulk.WriteOptimization;
@@ -40,6 +41,15 @@ public BulkGetRequest withWriteOptimization(final WriteOptimization writeOptimiz
         super.withWriteOptimization(writeOptimization);
         return this;
     }
+    
+    public BulkGetRequest withChunkOrdering(final ChunkClientProcessingOrderGuarantee chunkOrdering) {
+        this.chunkOrdering = chunkOrdering;
+        return this;
+    }
+    
+    public ChunkClientProcessingOrderGuarantee getChunkOrdering() {
+        return this.chunkOrdering;
+    }
 
     @Override
     public BulkCommand getCommand() {

sdk/src/main/java/com/spectralogic/ds3client/commands/BulkRequest.java

@@ -17,10 +17,7 @@
 
 import com.spectralogic.ds3client.BulkCommand;
 import com.spectralogic.ds3client.HttpVerb;
-import com.spectralogic.ds3client.models.bulk.Ds3Object;
-import com.spectralogic.ds3client.models.bulk.Ds3ObjectList;
-import com.spectralogic.ds3client.models.bulk.Priority;
-import com.spectralogic.ds3client.models.bulk.WriteOptimization;
+import com.spectralogic.ds3client.models.bulk.*;
 import com.spectralogic.ds3client.serializer.XmlOutput;
 
 import java.io.ByteArrayInputStream;
@@ -35,6 +32,7 @@ abstract class BulkRequest extends AbstractRequest {
     private long size;
     private Priority priority;
     private WriteOptimization writeOptimization;
+    protected ChunkClientProcessingOrderGuarantee chunkOrdering;
 
     public BulkRequest(final String bucket, final List<Ds3Object> objects) {
         this.bucket = bucket;
@@ -57,6 +55,7 @@ private InputStream generateStream() {
         objects.setObjects(this.ds3Objects);
         objects.setPriority(this.priority);
         objects.setWriteOptimization(this.writeOptimization);
+        objects.setChunkClientProcessingOrderGuarantee(this.chunkOrdering);
         final String xmlOutput = XmlOutput.toXml(objects, this.getCommand());
 
         final byte[] stringBytes = xmlOutput.getBytes();

sdk/src/main/java/com/spectralogic/ds3client/commands/GetAvailableJobChunksResponse.java

@@ -79,6 +79,10 @@ private static MasterObjectList parseMasterObjectList(final WebResponse webRespo
     }
 
     private static int parseRetryAfter(final WebResponse webResponse) {
-        return Integer.parseInt(webResponse.getHeaders().get("Retry-After"));
+        final String retryAfter = webResponse.getHeaders().get("Retry-After");
+        if (retryAfter == null) {
+            throw new RetryAfterExpectedException();
+        }
+        return Integer.parseInt(retryAfter);
     }
 }

sdk/src/main/java/com/spectralogic/ds3client/commands/RetryAfterExpectedException.java

@@ -0,0 +1,24 @@
+/*
+ * ******************************************************************************
+ *   Copyright 2014 Spectra Logic Corporation. All Rights Reserved.
+ *   Licensed under the Apache License, Version 2.0 (the "License"). You may not use
+ *   this file except in compliance with the License. A copy of the License is located at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file.
+ *   This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ *   CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ *   specific language governing permissions and limitations under the License.
+ * ****************************************************************************
+ */
+
+package com.spectralogic.ds3client.commands;
+
+public class RetryAfterExpectedException extends RuntimeException {
+    private static final long serialVersionUID = 6193215224073981762L;
+    
+    public RetryAfterExpectedException() {
+        super("Based on the response the server should have returned a Retry-After HTTP header.");
+    }
+}

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

@@ -22,6 +22,7 @@
 import com.spectralogic.ds3client.helpers.options.WriteJobOptions;
 import com.spectralogic.ds3client.models.Contents;
 import com.spectralogic.ds3client.models.ListBucketResult;
+import com.spectralogic.ds3client.models.bulk.ChunkClientProcessingOrderGuarantee;
 import com.spectralogic.ds3client.models.bulk.Ds3Object;
 import com.spectralogic.ds3client.serializer.XmlProcessingException;
 
@@ -90,6 +91,7 @@ public Ds3ClientHelpers.Job startReadJob(final String bucket, final Iterable<Ds3
     private Ds3ClientHelpers.Job innerStartReadJob(final String bucket, final Iterable<Ds3Object> objectsToRead, final ReadJobOptions options)
             throws SignatureException, IOException, XmlProcessingException {
         final BulkGetResponse prime = this.client.bulkGet(new BulkGetRequest(bucket, Lists.newArrayList(objectsToRead))
+                .withChunkOrdering(ChunkClientProcessingOrderGuarantee.NONE)
                 .withPriority(options.getPriority()));
         return new ReadJobImpl(this.client, prime.getResult());
     }

sdk/src/main/java/com/spectralogic/ds3client/models/bulk/Ds3ObjectList.java

@@ -17,6 +17,9 @@ public class Ds3ObjectList {
     @JacksonXmlProperty(isAttribute = true, namespace = "", localName = "WriteOptimization")
     private WriteOptimization writeOptimization;
 
+    @JacksonXmlProperty(isAttribute = true, namespace = "", localName = "ChunkClientProcessingOrderGuarantee")
+    private ChunkClientProcessingOrderGuarantee chunkClientProcessingOrderGuarantee;
+
     public Ds3ObjectList() {
     }
 
@@ -41,10 +44,18 @@ public void setPriority(final Priority priority) {
     }
 
     public WriteOptimization getWriteOptimization() {
-        return writeOptimization;
+        return this.writeOptimization;
     }
 
     public void setWriteOptimization(final WriteOptimization writeOptimization) {
         this.writeOptimization = writeOptimization;
     }
+
+    public ChunkClientProcessingOrderGuarantee getChunkClientProcessingOrderGuarantee() {
+        return this.chunkClientProcessingOrderGuarantee;
+    }
+
+    public void setChunkClientProcessingOrderGuarantee(final ChunkClientProcessingOrderGuarantee chunkClientProcessingOrderGuarantee) {
+        this.chunkClientProcessingOrderGuarantee = chunkClientProcessingOrderGuarantee;
+    }
 }

sdk/src/test/java/com/spectralogic/ds3client/helpers/Ds3ClientHelpers_Test.java

@@ -53,7 +53,7 @@ public void testReadObjects() throws SignatureException, IOException, XmlProcess
         final Ds3Client ds3Client = buildDs3ClientForBulk();
 
         final BulkGetResponse buildBulkGetResponse = buildBulkGetResponse();
-        Mockito.when(ds3Client.bulkGet(Mockito.any(BulkGetRequest.class))).thenReturn(buildBulkGetResponse);
+        Mockito.when(ds3Client.bulkGet(hasChunkOrdering(ChunkClientProcessingOrderGuarantee.NONE))).thenReturn(buildBulkGetResponse);
 
         Mockito.when(ds3Client.getObject(getRequestHas(MYBUCKET, "foo", jobId, 0))).then(getObjectAnswer("foo co"));
         Mockito.when(ds3Client.getObject(getRequestHas(MYBUCKET, "bar", jobId, 0))).then(getObjectAnswer("bar contents"));
@@ -97,7 +97,7 @@ public void testReadObjectsWithFailedGet() throws SignatureException, IOExceptio
         Mockito.when(ds3Client.buildFactory(Mockito.<Iterable<Node>>any())).thenReturn(ds3ClientFactory);
 
         final BulkGetResponse buildBulkGetResponse = buildBulkGetResponse();
-        Mockito.when(ds3Client.bulkGet(Mockito.any(BulkGetRequest.class))).thenReturn(buildBulkGetResponse);
+        Mockito.when(ds3Client.bulkGet(hasChunkOrdering(ChunkClientProcessingOrderGuarantee.NONE))).thenReturn(buildBulkGetResponse);
 
         final GetAvailableJobChunksResponse jobChunksResponse = buildJobChunksResponse2();
         Mockito.when(ds3Client.getAvailableJobChunks(hasJobId(jobId))).thenReturn(jobChunksResponse);

sdk/src/test/java/com/spectralogic/ds3client/helpers/RequestMatchers.java

@@ -16,6 +16,7 @@
 package com.spectralogic.ds3client.helpers;
 
 import com.spectralogic.ds3client.commands.*;
+import com.spectralogic.ds3client.models.bulk.ChunkClientProcessingOrderGuarantee;
 
 import org.apache.commons.io.IOUtils;
 import org.hamcrest.Description;
@@ -30,6 +31,35 @@
 import static org.mockito.Matchers.*;
 
 public class RequestMatchers {
+    public static BulkGetRequest hasChunkOrdering(final ChunkClientProcessingOrderGuarantee chunkOrdering) {
+        return argThat(new TypeSafeMatcher<BulkGetRequest>() {
+            @Override
+            protected boolean matchesSafely(final BulkGetRequest item) {
+                return item.getChunkOrdering() == null
+                        ? chunkOrdering == null
+                        : item.getChunkOrdering().equals(chunkOrdering);
+            }
+
+            @Override
+            public void describeTo(final Description description) {
+                describe(chunkOrdering, description);
+            }
+            
+            @Override
+            protected void describeMismatchSafely(final BulkGetRequest item, final Description mismatchDescription) {
+                describe(item.getChunkOrdering(), mismatchDescription);
+            }
+
+            private void describe(
+                    final ChunkClientProcessingOrderGuarantee chunkOrdering,
+                    final Description description) {
+                description
+                        .appendText("BulkGetRequest with Chunk Ordering: ")
+                        .appendValue(chunkOrdering);
+            }
+        });
+    }
+
     public static GetAvailableJobChunksRequest hasJobId(final UUID jobId) {
         return argThat(new TypeSafeMatcher<GetAvailableJobChunksRequest>() {
             @Override