Fixed stage objects job command

Author: RachelTucker

ds3-sdk-integration/src/test/java/com/spectralogic/ds3client/integration/VersionedObject_Test.java

@@ -18,7 +18,9 @@
 import com.spectralogic.ds3client.Ds3Client;
 import com.spectralogic.ds3client.commands.GetBucketRequest;
 import com.spectralogic.ds3client.commands.GetBucketResponse;
+import com.spectralogic.ds3client.commands.spectrads3.DeleteBucketSpectraS3Request;
 import com.spectralogic.ds3client.commands.spectrads3.GetBulkJobSpectraS3Request;
+import com.spectralogic.ds3client.commands.spectrads3.StageObjectsJobSpectraS3Request;
 import com.spectralogic.ds3client.helpers.Ds3ClientHelpers;
 import com.spectralogic.ds3client.integration.test.helpers.TempStorageIds;
 import com.spectralogic.ds3client.integration.test.helpers.TempStorageUtil;
@@ -106,4 +108,34 @@ public void getObjectsWithVersioning() throws IOException, URISyntaxException {
             deleteAllContents(CLIENT, TEST_ENV_NAME);
         }
     }
+
+    @Test
+    public void stageObjectsWithVersioning() throws IOException, URISyntaxException {
+        try {
+            HELPERS.ensureBucketExists(TEST_ENV_NAME, envDataPolicyId);
+            final String objectName = "object_with_versions";
+
+            // Put different content for object twice
+            loadTestBook(CLIENT, BOOKS[0], objectName, TEST_ENV_NAME); // putting beowulf as content
+            loadTestBook(CLIENT, BOOKS[1], objectName, TEST_ENV_NAME); // putting sherlock holmes as content
+
+            // Get the version of the objects
+            final GetBucketRequest getBucketRequest = new GetBucketRequest(TEST_ENV_NAME).withVersions(true);
+            final GetBucketResponse getBucketResponse = CLIENT.getBucket(getBucketRequest);
+
+            assertThat(getBucketResponse.getListBucketResult().getObjects().size(), is(0));
+            assertThat(getBucketResponse.getListBucketResult().getVersionedObjects().size(), is(2));
+
+            // Create bulk get job with both versions of object specified
+            final List<Ds3Object> objects = getBucketResponse.getListBucketResult().getVersionedObjects().stream()
+                    .map(obj -> new Ds3Object(obj.getKey(), obj.getVersionId()))
+                    .collect(Collectors.toList());
+
+            final StageObjectsJobSpectraS3Request stageRequest = new StageObjectsJobSpectraS3Request(TEST_ENV_NAME, objects);
+            CLIENT.stageObjectsJobSpectraS3(stageRequest);
+
+        } finally {
+            CLIENT.deleteBucketSpectraS3(new DeleteBucketSpectraS3Request(TEST_ENV_NAME).withForce(true));
+        }
+    }
 }

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/parsers/StageObjectsJobSpectraS3ResponseParser.java

@@ -18,18 +18,31 @@
 
 import com.spectralogic.ds3client.commands.parsers.interfaces.AbstractResponseParser;
 import com.spectralogic.ds3client.commands.parsers.utils.ResponseParserUtils;
+import com.spectralogic.ds3client.commands.spectrads3.PutBulkJobSpectraS3Response;
 import com.spectralogic.ds3client.commands.spectrads3.StageObjectsJobSpectraS3Response;
+import com.spectralogic.ds3client.models.MasterObjectList;
 import com.spectralogic.ds3client.networking.WebResponse;
+import com.spectralogic.ds3client.serializer.XmlOutput;
+
 import java.io.IOException;
+import java.io.InputStream;
 
 public class StageObjectsJobSpectraS3ResponseParser extends AbstractResponseParser<StageObjectsJobSpectraS3Response> {
-    private final int[] expectedStatusCodes = new int[]{};
+    private final int[] expectedStatusCodes = new int[]{200};
 
     @Override
     public StageObjectsJobSpectraS3Response parseXmlResponse(final WebResponse response) throws IOException {
         final int statusCode = response.getStatusCode();
         if (ResponseParserUtils.validateStatusCode(statusCode, expectedStatusCodes)) {
             switch (statusCode) {
+            case 200:
+                if (ResponseParserUtils.getSizeFromHeaders(response.getHeaders()) == 0) {
+                   return new StageObjectsJobSpectraS3Response(null, this.getChecksum(), this.getChecksumType());
+                }
+                try (final InputStream inputStream = response.getResponseStream()) {
+                    final MasterObjectList result = XmlOutput.fromXml(inputStream, MasterObjectList.class);
+                    return new StageObjectsJobSpectraS3Response(result, this.getChecksum(), this.getChecksumType());
+                }
             default:
                 assert false: "validateStatusCode should have made it impossible to reach this line";
             }

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/spectrads3/StageObjectsJobSpectraS3Request.java

@@ -16,16 +16,15 @@
 // This code is auto-generated, do not modify
 package com.spectralogic.ds3client.commands.spectrads3;
 
-import com.spectralogic.ds3client.networking.HttpVerb;
-import com.spectralogic.ds3client.commands.interfaces.AbstractRequest;
-import com.google.common.net.UrlEscapers;
+import com.spectralogic.ds3client.BulkCommand;
+import com.spectralogic.ds3client.commands.interfaces.BulkRequest;
 import com.spectralogic.ds3client.models.Priority;
+import com.spectralogic.ds3client.models.bulk.Ds3Object;
+import com.spectralogic.ds3client.networking.HttpVerb;
 
-public class StageObjectsJobSpectraS3Request extends AbstractRequest {
+public class StageObjectsJobSpectraS3Request extends BulkRequest {
 
     // Variables
-    
-    private final String bucketName;
 
     private String name;
 
@@ -34,8 +33,8 @@ public class StageObjectsJobSpectraS3Request extends AbstractRequest {
     // Constructor
 
 
-    public StageObjectsJobSpectraS3Request(final String bucketName) {
-        this.bucketName = bucketName;
+    public StageObjectsJobSpectraS3Request(final String bucketName, final Iterable<Ds3Object> objects) {
+        super(bucketName, objects);
 
         this.getQueryParams().put("operation", "start_bulk_stage");
 
@@ -62,12 +61,8 @@ public HttpVerb getVerb() {
     }
 
     @Override
-    public String getPath() {
-        return "/_rest_/bucket/" + this.bucketName;
-    }
-    
-    public String getBucketName() {
-        return this.bucketName;
+    public BulkCommand getCommand() {
+        return BulkCommand.GET;
     }
 
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/spectrads3/StageObjectsJobSpectraS3Response.java

@@ -16,13 +16,15 @@
 // This code is auto-generated, do not modify
 package com.spectralogic.ds3client.commands.spectrads3;
 
+import com.spectralogic.ds3client.commands.interfaces.BulkResponse;
 import com.spectralogic.ds3client.models.ChecksumType;
 import com.spectralogic.ds3client.commands.interfaces.AbstractResponse;
+import com.spectralogic.ds3client.models.MasterObjectList;
 
-public class StageObjectsJobSpectraS3Response extends AbstractResponse {
+public class StageObjectsJobSpectraS3Response extends BulkResponse {
 
-    public StageObjectsJobSpectraS3Response(final String checksum, final ChecksumType.Type checksumType) {
-        super(checksum, checksumType);
+    public StageObjectsJobSpectraS3Response(final MasterObjectList masterObjectListResult, final String checksum, final ChecksumType.Type checksumType) {
+        super(masterObjectListResult, checksum, checksumType);
     }
 
 }