Casing fixes, Job API, Mock Simplification.

* Updated the casing to use the new API.
* Added calls for the new Job API.
* Abstracted the network response.
* Simplified the mocks setup since jmockit is really finicky.

Author: Hans-Peter Klett

.gitignore

@@ -13,3 +13,4 @@ atlassian-ide-plugin.xml
 *.iml
 *.txt
 *.class
+.*.swp

build.gradle

@@ -36,8 +36,6 @@ 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'
-    testCompile 'com.googlecode.jmockit:jmockit:1.6'
-    testCompile 'com.googlecode.jmockit:jmockit-coverage:0.999.24'
     testCompile 'junit:junit:4.11'
 }
 

src/main/java/com/spectralogic/ds3client/BulkCommand.java

@@ -18,6 +18,7 @@
 public enum BulkCommand {
     PUT, GET;
 
+    @Override
     public String toString() {
         if (this == PUT) {
             return "start_bulk_put";

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

@@ -116,8 +116,8 @@ public Builder withRedirectRetries(final int retries) {
          */
         @Override
         public Ds3Client build() {
-            final ConnectionDetailsImpl.Builder connBuilder = ConnectionDetailsImpl.builder(endpoint, credentials)
-                .withProxy(proxy).withSecure(secure).withRedirectRetries(retries);
+            final ConnectionDetailsImpl.Builder connBuilder = ConnectionDetailsImpl.builder(this.endpoint, this.credentials)
+                .withProxy(this.proxy).withSecure(this.secure).withRedirectRetries(this.retries);
 
             final NetworkClient netClient = new NetworkClientImpl(connBuilder.build());
             return new Ds3Client(netClient);
@@ -141,7 +141,7 @@ public static Builder builder(final String endpoint, final Credentials creds) {
     }
 
     NetworkClient getNetClient() {
-        return netClient;
+        return this.netClient;
     }
 
     /**
@@ -152,7 +152,7 @@ NetworkClient getNetClient() {
      * @throws SignatureException
      */
     public GetServiceResponse getService(final GetServiceRequest request) throws IOException, SignatureException {
-        return new GetServiceResponse(netClient.getResponse(request));
+        return new GetServiceResponse(this.netClient.getResponse(request));
     }
 
     /**
@@ -168,7 +168,7 @@ public GetServiceResponse getService(final GetServiceRequest request) throws IOE
      * @throws SignatureException
      */
     public GetBucketResponse getBucket(final GetBucketRequest request) throws IOException, SignatureException {
-        return new GetBucketResponse(netClient.getResponse(request));
+        return new GetBucketResponse(this.netClient.getResponse(request));
     }
 
     /**
@@ -183,7 +183,7 @@ public GetBucketResponse getBucket(final GetBucketRequest request) throws IOExce
      * @throws SignatureException
      */
     public PutBucketResponse putBucket(final PutBucketRequest request) throws IOException, SignatureException {
-        return new PutBucketResponse(netClient.getResponse(request));
+        return new PutBucketResponse(this.netClient.getResponse(request));
     }
 
     /**
@@ -196,7 +196,7 @@ public PutBucketResponse putBucket(final PutBucketRequest request) throws IOExce
      * @throws SignatureException
      */
     public HeadBucketResponse headBucket(final HeadBucketRequest request) throws IOException, SignatureException {
-        return new HeadBucketResponse(netClient.getResponse(request));
+        return new HeadBucketResponse(this.netClient.getResponse(request));
     }
 
     /**
@@ -212,7 +212,7 @@ public HeadBucketResponse headBucket(final HeadBucketRequest request) throws IOE
      * @throws SignatureException
      */
     public DeleteBucketResponse deleteBucket(final DeleteBucketRequest request) throws IOException, SignatureException {
-        return new DeleteBucketResponse(netClient.getResponse(request));
+        return new DeleteBucketResponse(this.netClient.getResponse(request));
     }
 
     /**
@@ -227,7 +227,7 @@ public DeleteBucketResponse deleteBucket(final DeleteBucketRequest request) thro
      * @throws SignatureException
      */
     public DeleteObjectResponse deleteObject(final DeleteObjectRequest request) throws IOException, SignatureException {
-        return new DeleteObjectResponse(netClient.getResponse(request));
+        return new DeleteObjectResponse(this.netClient.getResponse(request));
     }
 
     /**
@@ -241,7 +241,7 @@ public DeleteObjectResponse deleteObject(final DeleteObjectRequest request) thro
      * @throws SignatureException
      */
     public GetObjectResponse getObject(final GetObjectRequest request) throws IOException, SignatureException {
-        return new GetObjectResponse(netClient.getResponse(request));
+        return new GetObjectResponse(this.netClient.getResponse(request));
     }
 
     /**
@@ -256,7 +256,7 @@ public GetObjectResponse getObject(final GetObjectRequest request) throws IOExce
      * @throws SignatureException
      */
     public PutObjectResponse putObject(final PutObjectRequest request) throws IOException, SignatureException {
-        return new PutObjectResponse(netClient.getResponse(request));
+        return new PutObjectResponse(this.netClient.getResponse(request));
     }
 
     /**
@@ -271,7 +271,7 @@ public PutObjectResponse putObject(final PutObjectRequest request) throws IOExce
      * @throws SignatureException
      */
     public BulkGetResponse bulkGet(final BulkGetRequest request) throws IOException, SignatureException {
-        return new BulkGetResponse(netClient.getResponse(request));
+        return new BulkGetResponse(this.netClient.getResponse(request));
     }
 
     /**
@@ -286,7 +286,17 @@ public BulkGetResponse bulkGet(final BulkGetRequest request) throws IOException,
      * @throws SignatureException
      */
     public BulkPutResponse bulkPut(final BulkPutRequest request) throws IOException, SignatureException {
-        return new BulkPutResponse(netClient.getResponse(request));
+        return new BulkPutResponse(this.netClient.getResponse(request));
+    }
+
+    //TODO
+    public GetJobListResponse getJobList(final GetJobListRequest request) throws IOException, SignatureException {
+        return new GetJobListResponse(this.netClient.getResponse(request));
+    }
+
+    //TODO
+    public GetJobResponse getJob(final GetJobRequest request) throws IOException, SignatureException {
+        return new GetJobResponse(this.netClient.getResponse(request));
     }
 }
 

src/main/java/com/spectralogic/ds3client/NetworkClientImpl.java

@@ -37,11 +37,7 @@
 
 import com.spectralogic.ds3client.commands.Ds3Request;
 import com.spectralogic.ds3client.models.SignatureDetails;
-import com.spectralogic.ds3client.networking.ConnectionDetails;
-import com.spectralogic.ds3client.networking.NetUtils;
-import com.spectralogic.ds3client.networking.NetworkClient;
-import com.spectralogic.ds3client.networking.RequiresMarkSupportedException;
-import com.spectralogic.ds3client.networking.TooManyRedirectsException;
+import com.spectralogic.ds3client.networking.*;
 import com.spectralogic.ds3client.utils.DateFormatter;
 import com.spectralogic.ds3client.utils.Signature;
 
@@ -64,7 +60,7 @@ public ConnectionDetails getConnectionDetails() {
     }
 
     @Override
-    public CloseableHttpResponse getResponse(final Ds3Request request) throws IOException, SignatureException {
+    public WebResponse getResponse(final Ds3Request request) throws IOException, SignatureException {
         try (final RequestExecutor requestExecutor = new RequestExecutor(request)) {
             boolean redirect = false;
             int redirectCount = 0;
@@ -75,7 +71,7 @@ public CloseableHttpResponse getResponse(final Ds3Request request) throws IOExce
                     redirectCount++;
                     continue;
                 }
-                return response;
+                return new WebResponseImpl(response);
             } while (redirect && redirectCount < this.connectionDetails.getRetries());
 
             throw new TooManyRedirectsException(redirectCount);

src/main/java/com/spectralogic/ds3client/WebResponseImpl.java

@@ -0,0 +1,31 @@
+package com.spectralogic.ds3client;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import org.apache.http.client.methods.CloseableHttpResponse;
+
+import com.spectralogic.ds3client.networking.WebResponse;
+
+class WebResponseImpl implements WebResponse {
+    private final CloseableHttpResponse response;
+
+    public WebResponseImpl(final CloseableHttpResponse response) {
+        this.response = response;
+    }
+    
+    @Override
+    public InputStream getResponseStream() throws IOException {
+        return this.response.getEntity().getContent();
+    }
+
+    @Override
+    public int getStatusCode() {
+        return this.response.getStatusLine().getStatusCode();
+    }
+
+    @Override
+    public void close() throws IOException {
+        this.response.close();
+    }
+}

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

@@ -19,35 +19,35 @@
 import java.io.InputStream;
 import java.io.StringWriter;
 
-import com.google.common.collect.ImmutableSet;
 import org.apache.commons.io.IOUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
 
+import com.google.common.collect.ImmutableSet;
+import com.spectralogic.ds3client.models.Error;
 import com.spectralogic.ds3client.networking.FailedRequestException;
+import com.spectralogic.ds3client.networking.WebResponse;
 import com.spectralogic.ds3client.serializer.XmlOutput;
-import com.spectralogic.ds3client.models.Error;
 
 abstract class AbstractResponse implements Ds3Response{
     final static String UTF8 = "UTF-8";
 
-    final private CloseableHttpResponse response;
+    final private WebResponse response;
 
-    AbstractResponse(final CloseableHttpResponse response) throws IOException {
+    AbstractResponse(final WebResponse response) throws IOException {
         this.response = response;
-        processResponse();
+        this.processResponse();
     }
 
     protected abstract void processResponse() throws IOException;
 
-    CloseableHttpResponse getResponse() {
-        return response;
+    WebResponse getResponse() {
+        return this.response;
     }
 
     void checkStatusCode(final int ... expectedStatuses) throws IOException {
-        final ImmutableSet<Integer> expectedSet = createExpectedSet(expectedStatuses);
-        final int statusCode = getStatusCode();
+        final ImmutableSet<Integer> expectedSet = this.createExpectedSet(expectedStatuses);
+        final int statusCode = this.getStatusCode();
         if (!expectedSet.contains(statusCode)) {
-            final String responseString = readResponseString();
+            final String responseString = this.readResponseString();
             throw new FailedRequestException(
                 expectedStatuses,
                 statusCode,
@@ -58,7 +58,7 @@ void checkStatusCode(final int ... expectedStatuses) throws IOException {
     }
 
     int getStatusCode() {
-        return response.getStatusLine().getStatusCode();
+        return this.response.getStatusCode();
     }
 
     private ImmutableSet<Integer> createExpectedSet(final int[] expectedStatuses) {
@@ -80,14 +80,14 @@ private static Error parseErrorResponse(final String responseString) {
 
     private String readResponseString() throws IOException {
         try(final StringWriter writer = new StringWriter();
-            final InputStream content = response.getEntity().getContent()) {
+            final InputStream content = this.response.getResponseStream()) {
             IOUtils.copy(content, writer, UTF8);
             return writer.toString();
         }
     }
 
     @Override
     public void close() throws IOException {
-        response.close();
+        this.response.close();
     }
 }

src/main/java/com/spectralogic/ds3client/commands/BulkGetResponse.java

@@ -16,12 +16,12 @@
 package com.spectralogic.ds3client.commands;
 
 
-import org.apache.http.client.methods.CloseableHttpResponse;
-
 import java.io.IOException;
 
+import com.spectralogic.ds3client.networking.WebResponse;
+
 public class BulkGetResponse extends BulkResponse {
-    public BulkGetResponse(final CloseableHttpResponse response) throws IOException {
+    public BulkGetResponse(final WebResponse response) throws IOException {
         super(response);
     }
 }

src/main/java/com/spectralogic/ds3client/commands/BulkPutResponse.java

@@ -15,12 +15,12 @@
 
 package com.spectralogic.ds3client.commands;
 
-import org.apache.http.client.methods.CloseableHttpResponse;
-
 import java.io.IOException;
 
+import com.spectralogic.ds3client.networking.WebResponse;
+
 public class BulkPutResponse extends BulkResponse {
-    public BulkPutResponse(final CloseableHttpResponse response) throws IOException {
+    public BulkPutResponse(final WebResponse response) throws IOException {
         super(response);
     }
 }

src/main/java/com/spectralogic/ds3client/commands/BulkResponse.java

@@ -15,36 +15,35 @@
 
 package com.spectralogic.ds3client.commands;
 
-import com.spectralogic.ds3client.models.MasterObjectList;
-import com.spectralogic.ds3client.serializer.XmlOutput;
-import org.apache.commons.io.IOUtils;
-import org.apache.http.client.methods.CloseableHttpResponse;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.StringWriter;
 
+import org.apache.commons.io.IOUtils;
+
+import com.spectralogic.ds3client.models.MasterObjectList;
+import com.spectralogic.ds3client.networking.WebResponse;
+import com.spectralogic.ds3client.serializer.XmlOutput;
+
 public abstract class BulkResponse extends AbstractResponse {
     private MasterObjectList result;
-    public BulkResponse(final CloseableHttpResponse response) throws IOException {
+    public BulkResponse(final WebResponse response) throws IOException {
         super(response);
     }
 
     public MasterObjectList getResult() {
-        return result;
+        return this.result;
     }
 
     @Override
     protected void processResponse() throws IOException {
-        checkStatusCode(200);
-        final CloseableHttpResponse response = getResponse();
-
+        this.checkStatusCode(200);
         try(final StringWriter writer = new StringWriter();
-            final InputStream content = response.getEntity().getContent()){
+            final InputStream content = this.getResponse().getResponseStream()) {
 
             IOUtils.copy(content, writer, UTF8);
 
-            result = XmlOutput.fromXml(writer.toString(), MasterObjectList.class);
+            this.result = XmlOutput.fromXml(writer.toString(), MasterObjectList.class);
         }
     }
 }