Fixed bulk pluralization and helpers for semantics

* Fixed /_rest_/buckets to be /_rest_bucket.
* Updated the helpers for the new semantic changes.

Author: Hans-Peter Klett

src/main/java/com/spectralogic/ds3client/helpers/Ds3ClientFactory.java

@@ -0,0 +1,22 @@
+/*
+ * ******************************************************************************
+ *   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.helpers;
+
+import com.spectralogic.ds3client.Ds3Client;
+
+interface Ds3ClientFactory {
+    Ds3Client GetClientForServerId(String serverId);
+}

src/main/java/com/spectralogic/ds3client/helpers/Ds3ClientFactoryImpl.java

@@ -0,0 +1,31 @@
+/*
+ * ******************************************************************************
+ *   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.helpers;
+
+import com.spectralogic.ds3client.Ds3Client;
+
+public class Ds3ClientFactoryImpl implements Ds3ClientFactory {
+    private final Ds3Client client;
+
+    public Ds3ClientFactoryImpl(final Ds3Client client) {
+        this.client = client;
+    }
+
+    @Override
+    public Ds3Client GetClientForServerId(final String serverId) {
+        return this.client;
+    }
+}

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

@@ -48,7 +48,7 @@ public Ds3ClientHelpers.WriteJob startWriteJob(final String bucket, final Iterab
             throws SignatureException, IOException, XmlProcessingException {
         try(final BulkPutResponse prime = this.client.bulkPut(new BulkPutRequest(bucket, Lists.newArrayList(objectsToWrite)))) {
             final MasterObjectList result = prime.getResult();
-            return new WriteJobImpl(this.client, result.getJobId(), bucket, result.getObjects());
+            return new WriteJobImpl(new Ds3ClientFactoryImpl(this.client), result.getJobId(), bucket, result.getObjects());
         }
     }
 
@@ -57,7 +57,7 @@ public Ds3ClientHelpers.ReadJob startReadJob(final String bucket, final Iterable
             throws SignatureException, IOException, XmlProcessingException {
         try(final BulkGetResponse prime = this.client.bulkGet(new BulkGetRequest(bucket, Lists.newArrayList(objectsToRead)))) {
             final MasterObjectList result = prime.getResult();
-            return new ReadJobImpl(this.client, result.getJobId(), bucket, result.getObjects());
+            return new ReadJobImpl(new Ds3ClientFactoryImpl(this.client), result.getJobId(), bucket, result.getObjects());
         }
     }
 
@@ -79,7 +79,12 @@ public WriteJob recoverWriteJob(final UUID jobId) throws SignatureException, IOE
         try (final GetJobResponse job = this.client.getJob(new GetJobRequest(jobId))) {
             final JobInfo jobInfo = job.getJobInfo();
             checkJobType(JOB_TYPE_PUT, jobInfo.getRequestType());
-            return new WriteJobImpl(this.client, jobInfo.getJobId(), jobInfo.getBucketName(), job.getObjectsList());
+            return new WriteJobImpl(
+                new Ds3ClientFactoryImpl(this.client),
+                jobInfo.getJobId(),
+                jobInfo.getBucketName(),
+                job.getObjectsList()
+            );
         }
     }
 
@@ -88,7 +93,12 @@ public ReadJob recoverReadJob(final UUID jobId) throws SignatureException, IOExc
         try (final GetJobResponse job = this.client.getJob(new GetJobRequest(jobId))) {
             final JobInfo jobInfo = job.getJobInfo();
             checkJobType(JOB_TYPE_GET, jobInfo.getRequestType());
-            return new ReadJobImpl(this.client, jobInfo.getJobId(), jobInfo.getBucketName(), convertFromJobObjectsList(job.getObjectsList()));
+            return new ReadJobImpl(
+                new Ds3ClientFactoryImpl(this.client),
+                jobInfo.getJobId(),
+                jobInfo.getBucketName(),
+                convertFromJobObjectsList(job.getObjectsList())
+            );
         }
     }
 

src/main/java/com/spectralogic/ds3client/helpers/JobImpl.java

@@ -37,18 +37,17 @@
 abstract class JobImpl implements Job {
     private static final int THREAD_COUNT = 10;
 
-    private final Ds3Client client;
+    private final Ds3ClientFactory clientFactory;
     private final UUID jobId;
     private final String bucketName;
     private final Iterable<? extends Objects> objectLists;
 
-    //TODO: client factory
     public JobImpl(
-            final Ds3Client client,
+            final Ds3ClientFactory clientFactory,
             final UUID jobId,
             final String bucketName,
             final Iterable<? extends Objects> objectLists) {
-        this.client = client;
+        this.clientFactory = clientFactory;
         this.jobId = jobId;
         this.bucketName = bucketName;
         this.objectLists = objectLists;
@@ -71,34 +70,38 @@ public void Transfer(Ds3Client client, UUID jobId, String bucketName, Ds3Object
 
     protected void transferAll(final Transferrer transferrer)
             throws SignatureException, IOException, XmlProcessingException {
+        for (final Objects objects : this.objectLists) {
+            this.transferObjects(transferrer, objects);
+        }
+    }
+
+    private void transferObjects(final Transferrer transferrer, final Objects objects)
+            throws SignatureException, IOException, XmlProcessingException {
         final ListeningExecutorService service = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(THREAD_COUNT));
         try {
-            final List<ListenableFuture<?>> tasks = new ArrayList<ListenableFuture<?>>();
-            for (final Objects objects : this.objectLists) {
-                tasks.add(service.submit(this.createObjectListTask(transferrer, objects)));
+            final Ds3Client client = this.clientFactory.GetClientForServerId(objects.getServerId());
+            final List<ListenableFuture<?>> tasks = new ArrayList<>();
+            for (final Ds3Object ds3Object : objects) {
+                tasks.add(this.createTransferTask(transferrer, service, client, ds3Object));
             }
             this.executeWithExceptionHandling(tasks);
         } finally {
             service.shutdown();
         }
     }
 
-    private Callable<?> createObjectListTask(final Transferrer transferrer, final Objects objects) {
-        return new Callable<Object>() {
+    private ListenableFuture<?> createTransferTask(
+            final Transferrer transferrer,
+            final ListeningExecutorService service,
+            final Ds3Client client,
+            final Ds3Object ds3Object) {
+        return service.submit(new Callable<Object>() {
             @Override
             public Object call() throws Exception {
-                final Ds3Client client = JobImpl.this.getClient(objects.getServerId());
-                for (final Ds3Object ds3Object : objects) {
-                    transferrer.Transfer(client, JobImpl.this.jobId, JobImpl.this.bucketName, ds3Object);
-                }
+                transferrer.Transfer(client, JobImpl.this.jobId, JobImpl.this.bucketName, ds3Object);
                 return null;
             }
-        };
-    }
-    
-    //TODO: this needs to come from a Ds3Client factory that knows how to update the server id.
-    private Ds3Client getClient(final String serverId) {
-        return this.client;
+        });
     }
 
     private void executeWithExceptionHandling(final List<ListenableFuture<?>> tasks)

src/main/java/com/spectralogic/ds3client/helpers/ReadJobImpl.java

@@ -33,11 +33,11 @@ class ReadJobImpl extends JobImpl implements ReadJob {
     private GetRequestModifier modifier;
 
     public ReadJobImpl(
-            final Ds3Client client,
+            final Ds3ClientFactory clientFactory,
             final UUID jobId,
             final String bucketName,
             final Iterable<? extends Objects> objectLists) {
-        super(client, jobId, bucketName, objectLists);
+        super(clientFactory, jobId, bucketName, objectLists);
     }
 
     @Override

src/main/java/com/spectralogic/ds3client/helpers/WriteJobImpl.java

@@ -32,11 +32,11 @@ class WriteJobImpl extends JobImpl implements WriteJob {
     private PutRequestModifier modifier;
 
     public WriteJobImpl(
-            final Ds3Client client,
+            final Ds3ClientFactory clientFactory,
             final UUID jobId,
             final String bucketName,
             final Iterable<? extends Objects> objectLists) {
-        super(client, jobId, bucketName, objectLists);
+        super(clientFactory, jobId, bucketName, objectLists);
     }
 
     @Override

src/test/java/com/spectralogic/ds3client/Ds3Client_Test.java

@@ -272,7 +272,7 @@ public void runBulkTest(final BulkCommand command, final BulkTestDriver driver)
         queryParams.put("operation", command.toString());
 
         final Ds3Client client = MockNetwork
-                .expecting(HttpVerb.PUT, "/_rest_/buckets/bulkTest", queryParams, expectedXmlBody)
+                .expecting(HttpVerb.PUT, "/_rest_/bucket/bulkTest", queryParams, expectedXmlBody)
                 .returning(200, xmlResponse)
                 .asClient();
 

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

@@ -24,6 +24,7 @@
 import java.io.*;
 import java.security.SignatureException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 
@@ -339,29 +340,19 @@ public MasterObjectList getResult() {
     private static MasterObjectList buildMasterObjectList() {
         final MasterObjectList masterObjectList = new MasterObjectList();
         masterObjectList.setJobId(jobId);
-        masterObjectList.setObjects(makeObjectLists());
+        masterObjectList.setObjects(Arrays.asList(
+            makeObjects("192.168.56.100", Arrays.asList(new Ds3Object("baz", 12))),
+            makeObjects("192.168.56.100", Arrays.asList(new Ds3Object("foo", 12))),
+            makeObjects("192.168.56.101", Arrays.asList(new Ds3Object("bar", 12)))
+        ));
         return masterObjectList;
     }
 
-    private static List<Objects> makeObjectLists() {
-        final List<Objects> objectLists = new ArrayList<>();
-        objectLists.add(makeObjects1());
-        return objectLists;
-    }
-
-    private static Objects makeObjects1() {
-        final Objects objects1 = new Objects();
-        objects1.setServerId("192.168.56.100");
-        objects1.setObject(makeObjectList1());
-        return objects1;
-    }
-
-    private static ArrayList<Ds3Object> makeObjectList1() {
-        final ArrayList<Ds3Object> objectList1 = new ArrayList<>();
-        objectList1.add(new Ds3Object("baz", 12));
-        objectList1.add(new Ds3Object("foo", 12));
-        objectList1.add(new Ds3Object("bar", 12));
-        return objectList1;
+    private static Objects makeObjects(final String serverId, final List<Ds3Object> objectList) {
+        final Objects objects = new Objects();
+        objects.setServerId(serverId);
+        objects.setObject(objectList);
+        return objects;
     }
 
     private static final class StubException extends RuntimeException {