Merge pull request #543 from RachelTucker/update-5-0-autogen

Updated 5.0 API with old version removed and versionId added

Author: rpmoore

contract/4_0_0_contract.xml

@@ -35,7 +35,6 @@
 import java.io.IOException;
 import java.net.URISyntaxException;
 import java.nio.channels.FileChannel;
-import java.nio.channels.SeekableByteChannel;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;

contract/5_0_x_contract.xml

@@ -895,6 +895,7 @@ ModifyJobSpectraS3Response modifyJobSpectraS3(final ModifyJobSpectraS3Request re
     ReplicatePutJobSpectraS3Response replicatePutJobSpectraS3(final ReplicatePutJobSpectraS3Request request)
             throws IOException;
 
+    @ResponsePayloadModel("MasterObjectList")
     @Action("MODIFY")
     @Resource("BUCKET")
 

ds3-sdk-integration/src/main/java/com/spectralogic/ds3client/integration/Util.java

@@ -34,8 +34,6 @@ public abstract class BulkRequest extends AbstractRequest {
     private InputStream stream;
     private long size;
     private Priority priority;
-    private WriteOptimization writeOptimization;
-    protected JobChunkClientProcessingOrderGuarantee chunkOrdering;
 
     public BulkRequest(final String bucket, final Iterable<Ds3Object> objects) {
         this.bucket = bucket;
@@ -44,21 +42,14 @@ public BulkRequest(final String bucket, final Iterable<Ds3Object> objects) {
 
     public BulkRequest withPriority(final Priority priority) {
         this.priority = priority;
-        return this;
-    }
-
-    public BulkRequest withWriteOptimization(final WriteOptimization writeOptimization) {
-        this.writeOptimization = writeOptimization;
+        this.updateQueryParam("priority", priority);
         return this;
     }
 
     private InputStream generateStream() {
         final Ds3ObjectList objects =
                 new Ds3ObjectList();
         objects.setObjects(this.ds3Objects);
-        objects.setPriority(this.priority);
-        objects.setWriteOptimization(this.writeOptimization);
-        objects.setChunkClientProcessingOrderGuarantee(this.chunkOrdering);
 
         final StringBuilder xmlOutputBuilder = new StringBuilder();
         if (this.getCommand() == BulkCommand.PUT) {
@@ -108,8 +99,4 @@ public InputStream getStream() {
     public Priority getPriority() {
         return priority;
     }
-
-    public WriteOptimization getWriteOptimization() {
-        return writeOptimization;
-    }
 }

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

@@ -18,12 +18,10 @@
 
 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;
 
@@ -36,13 +34,11 @@ public StageObjectsJobSpectraS3Response parseXmlResponse(final WebResponse respo
         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/interfaces/BulkRequest.java

@@ -28,7 +28,6 @@
 import java.nio.charset.Charset;
 import com.spectralogic.ds3client.commands.interfaces.AbstractRequest;
 import com.google.common.net.UrlEscapers;
-import java.util.UUID;
 
 public class EjectStorageDomainBlobsSpectraS3Request extends AbstractRequest {
 
@@ -131,4 +130,5 @@ public String getEjectLocation() {
         return this.ejectLocation;
     }
 
+
 }

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

@@ -18,16 +18,14 @@
 
 import com.spectralogic.ds3client.networking.HttpVerb;
 import com.spectralogic.ds3client.commands.interfaces.AbstractRequest;
-import com.google.common.net.UrlEscapers;
 import java.util.UUID;
+import com.google.common.net.UrlEscapers;
 import com.spectralogic.ds3client.models.Priority;
 
 public class ImportAllPoolsSpectraS3Request extends AbstractRequest {
 
     // Variables
 
-    private String conflictResolutionMode;
-
     private String dataPolicyId;
 
     private Priority priority;
@@ -49,13 +47,6 @@ public ImportAllPoolsSpectraS3Request() {
 
     }
 
-    public ImportAllPoolsSpectraS3Request withConflictResolutionMode(final String conflictResolutionMode) {
-        this.conflictResolutionMode = conflictResolutionMode;
-        this.updateQueryParam("conflict_resolution_mode", conflictResolutionMode);
-        return this;
-    }
-
-
     public ImportAllPoolsSpectraS3Request withDataPolicyId(final UUID dataPolicyId) {
         this.dataPolicyId = dataPolicyId.toString();
         this.updateQueryParam("data_policy_id", dataPolicyId);
@@ -130,11 +121,6 @@ public String getPath() {
         return "/_rest_/pool";
     }
 
-    public String getConflictResolutionMode() {
-        return this.conflictResolutionMode;
-    }
-
-
     public String getDataPolicyId() {
         return this.dataPolicyId;
     }

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

@@ -18,16 +18,14 @@
 
 import com.spectralogic.ds3client.networking.HttpVerb;
 import com.spectralogic.ds3client.commands.interfaces.AbstractRequest;
-import com.google.common.net.UrlEscapers;
 import java.util.UUID;
+import com.google.common.net.UrlEscapers;
 import com.spectralogic.ds3client.models.Priority;
 
 public class ImportAllTapesSpectraS3Request extends AbstractRequest {
 
     // Variables
 
-    private String conflictResolutionMode;
-
     private String dataPolicyId;
 
     private Priority priority;
@@ -49,13 +47,6 @@ public ImportAllTapesSpectraS3Request() {
 
     }
 
-    public ImportAllTapesSpectraS3Request withConflictResolutionMode(final String conflictResolutionMode) {
-        this.conflictResolutionMode = conflictResolutionMode;
-        this.updateQueryParam("conflict_resolution_mode", conflictResolutionMode);
-        return this;
-    }
-
-
     public ImportAllTapesSpectraS3Request withDataPolicyId(final UUID dataPolicyId) {
         this.dataPolicyId = dataPolicyId.toString();
         this.updateQueryParam("data_policy_id", dataPolicyId);
@@ -130,11 +121,6 @@ public String getPath() {
         return "/_rest_/tape";
     }
 
-    public String getConflictResolutionMode() {
-        return this.conflictResolutionMode;
-    }
-
-
     public String getDataPolicyId() {
         return this.dataPolicyId;
     }

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

@@ -18,8 +18,8 @@
 
 import com.spectralogic.ds3client.networking.HttpVerb;
 import com.spectralogic.ds3client.commands.interfaces.AbstractRequest;
-import com.google.common.net.UrlEscapers;
 import java.util.UUID;
+import com.google.common.net.UrlEscapers;
 import com.spectralogic.ds3client.models.Priority;
 
 public class ImportPoolSpectraS3Request extends AbstractRequest {
@@ -28,8 +28,6 @@ public class ImportPoolSpectraS3Request extends AbstractRequest {
 
     private final String pool;
 
-    private String conflictResolutionMode;
-
     private String dataPolicyId;
 
     private Priority priority;
@@ -52,13 +50,6 @@ public ImportPoolSpectraS3Request(final String pool) {
 
     }
 
-    public ImportPoolSpectraS3Request withConflictResolutionMode(final String conflictResolutionMode) {
-        this.conflictResolutionMode = conflictResolutionMode;
-        this.updateQueryParam("conflict_resolution_mode", conflictResolutionMode);
-        return this;
-    }
-
-
     public ImportPoolSpectraS3Request withDataPolicyId(final UUID dataPolicyId) {
         this.dataPolicyId = dataPolicyId.toString();
         this.updateQueryParam("data_policy_id", dataPolicyId);
@@ -138,11 +129,6 @@ public String getPool() {
     }
 
 
-    public String getConflictResolutionMode() {
-        return this.conflictResolutionMode;
-    }
-
-
     public String getDataPolicyId() {
         return this.dataPolicyId;
     }