Merge pull request #43 from hansdude/master

Updated the client helpers to use the new requests.

Author: rpmoore

sdk/build.gradle

@@ -9,4 +9,5 @@ dependencies {
     compile     'org.codehaus.woodstox:woodstox-core-asl:4.2.0'
     compile     'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.2.3'
     compile     'com.google.guava:guava:16.0.1'
+    compile     'org.hamcrest:hamcrest-library:1.3'
 }

sdk/src/main/java/com/spectralogic/ds3client/Ds3Client.java

@@ -16,6 +16,7 @@
 package com.spectralogic.ds3client;
 
 import com.spectralogic.ds3client.commands.*;
+import com.spectralogic.ds3client.models.bulk.Node;
 
 import java.io.IOException;
 import java.security.SignatureException;
@@ -236,4 +237,9 @@ public abstract CancelJobResponse cancelJob(CancelJobRequest request)
      */
     public abstract ModifyJobResponse modifyJob(ModifyJobRequest request)
             throws IOException, SignatureException;
+
+    /**
+     * Creates a factory based on a set of nodes that can return clients by node id.
+     */
+    public abstract Ds3ClientFactory buildFactory(Iterable<Node> nodes);
 }

sdk/src/main/java/com/spectralogic/ds3client/helpers/Ds3ClientFactory.java renamed to sdk/src/main/java/com/spectralogic/ds3client/Ds3ClientFactory.java

@@ -13,12 +13,10 @@
  * ****************************************************************************
  */
 
-package com.spectralogic.ds3client.helpers;
-
-import com.spectralogic.ds3client.Ds3Client;
+package com.spectralogic.ds3client;
 
 import java.util.UUID;
 
-interface Ds3ClientFactory {
+public interface Ds3ClientFactory {
     Ds3Client getClientForNodeId(UUID nodeId);
 }

sdk/src/main/java/com/spectralogic/ds3client/Ds3ClientImpl.java

@@ -16,10 +16,12 @@
 package com.spectralogic.ds3client;
 
 import com.spectralogic.ds3client.commands.*;
+import com.spectralogic.ds3client.models.bulk.Node;
 import com.spectralogic.ds3client.networking.NetworkClient;
 
 import java.io.IOException;
 import java.security.SignatureException;
+import java.util.UUID;
 
 class Ds3ClientImpl implements Ds3Client {
     private final NetworkClient netClient;
@@ -115,4 +117,15 @@ public CancelJobResponse cancelJob(final CancelJobRequest request) throws IOExce
     public ModifyJobResponse modifyJob(final ModifyJobRequest request) throws IOException, SignatureException {
         return new ModifyJobResponse(this.netClient.getResponse(request));
     }
+
+    @Override
+    public Ds3ClientFactory buildFactory(final Iterable<Node> nodes) {
+        return new Ds3ClientFactory() {
+            @Override
+            public Ds3Client getClientForNodeId(final UUID nodeId) {
+                //TODO: pay attention to actual nodes.
+                return Ds3ClientImpl.this;
+            }
+        };
+    }
 }

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

@@ -96,4 +96,4 @@ private String readResponseString() throws IOException {
     public String getMd5() {
         return md5;
     }
-}
+}

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

@@ -31,7 +31,7 @@ public class AllocateJobChunkResponse extends AbstractResponse {
     private int retryAfterSeconds;
 
     static public enum Status {
-        ALLOCATED, RETRYLATER, NOTFOUND
+        ALLOCATED, RETRYLATER
     }
 
     public AllocateJobChunkResponse(final WebResponse response) throws IOException {
@@ -53,7 +53,7 @@ public int getRetryAfterSeconds() {
     @Override
     protected void processResponse() throws IOException {
         try (final WebResponse response = this.getResponse()) {
-            checkStatusCode(200, 503, 404);
+            checkStatusCode(200, 503);
             switch (this.getStatusCode()) {
             case 200:
                 this.status = Status.ALLOCATED;
@@ -63,9 +63,6 @@ protected void processResponse() throws IOException {
                 this.status = Status.RETRYLATER;
                 this.retryAfterSeconds = parseRetryAfter(response);
                 break;
-            case 404:
-                this.status = Status.NOTFOUND;
-                break;
             default:
                 assert false : "checkStatusCode should have made it impossible to reach this line.";
             }
@@ -80,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

@@ -31,7 +31,7 @@ public class GetAvailableJobChunksResponse extends AbstractResponse {
     private int retryAfterSeconds;
 
     static public enum Status {
-        AVAILABLE, RETRYLATER, NOTFOUND
+        AVAILABLE, RETRYLATER
     }
 
     public Status getStatus() {
@@ -53,7 +53,7 @@ public GetAvailableJobChunksResponse(final WebResponse response) throws IOExcept
     @Override
     protected void processResponse() throws IOException {
         try (final WebResponse webResponse = this.getResponse()) {
-            this.checkStatusCode(200, 404);
+            this.checkStatusCode(200);
             switch (this.getStatusCode()) {
             case 200:
                 this.masterObjectList = parseMasterObjectList(webResponse);
@@ -64,9 +64,6 @@ protected void processResponse() throws IOException {
                     this.status = Status.AVAILABLE;
                 }
                 break;
-            case 404:
-                this.status = Status.NOTFOUND;
-                break;
             default:
                 assert false : "checkStatusCode should have made it impossible to reach this line.";
             }
@@ -82,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.");
+    }
+}