Merge pull request #555 from LogicalChaos/versionId_in_payload

rpmoore · web-flow · commit f6e369e40ebd · 2018-04-05T16:39:59.000-06:00
Version id in payload
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@
 
 allprojects {
     group = 'com.spectralogic.ds3'
-    version = '3.2.8-COMPAT-2'
+    version = '3.2.8-COMPAT-3'
 }
 
 subprojects {
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/DeleteObjectsRequest.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/DeleteObjectsRequest.java
@@ -16,23 +16,28 @@
 // This code is auto-generated, do not modify
 package com.spectralogic.ds3client.commands;
 
-import com.spectralogic.ds3client.networking.HttpVerb;
-import com.spectralogic.ds3client.models.Contents;
-import com.spectralogic.ds3client.models.delete.Delete;
-import com.spectralogic.ds3client.models.delete.DeleteObject;
-import com.spectralogic.ds3client.serializer.XmlOutput;
-
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.nio.charset.Charset;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
-import java.nio.charset.Charset;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
 import com.spectralogic.ds3client.commands.interfaces.AbstractRequest;
+import com.spectralogic.ds3client.models.Contents;
+import com.spectralogic.ds3client.models.delete.Delete;
+import com.spectralogic.ds3client.models.delete.DeleteObject;
+import com.spectralogic.ds3client.networking.HttpVerb;
+import com.spectralogic.ds3client.serializer.XmlOutput;
 
 public class DeleteObjectsRequest extends AbstractRequest {
 
     // Variables
-    private final List<String> objects;
+    private final Map< String, Set< UUID > > objects;
     
     private final String bucketName;
 
@@ -44,29 +49,15 @@ public class DeleteObjectsRequest extends AbstractRequest {
     // Constructor
     
     
-    public DeleteObjectsRequest(final String bucketName, final List<String> objects) {
+    public DeleteObjectsRequest( final String bucketName, final Map< String, Set< UUID > > objects )
+    {
         this.bucketName = bucketName;
         this.objects = objects;
         
         this.getQueryParams().put("delete", null);
     }
-
     
-    public DeleteObjectsRequest(final String bucketName, final Iterable<Contents> objs) {
-        this.bucketName = bucketName;
-        
-        this.getQueryParams().put("delete", null);
-        this.objects = contentsToString(objs);
-    }
-
-    private static List<String> contentsToString(final Iterable<Contents> objs) {
-        final List<String> objKeyList = new ArrayList<>();
-        for (final Contents obj : objs) {
-            objKeyList.add(obj.getKey());
-        }
-        return objKeyList;
-    }
-
+    
     public DeleteObjectsRequest withReplicate(final boolean replicate) {
         this.replicate = replicate;
         if (this.replicate) {
@@ -89,9 +80,20 @@ public InputStream getStream() {
         final Delete delete = new Delete();
         delete.setQuiet(quiet);
         final List<DeleteObject> deleteObjects = new ArrayList<>();
-
-        for(final String objName : objects) {
-            deleteObjects.add(new DeleteObject(objName));
+    
+        for ( final Map.Entry< String, Set< UUID > > entry : objects.entrySet() )
+        {
+            if ( null == entry.getValue() )
+            {
+                deleteObjects.add( new DeleteObject( entry.getKey(), null ) );
+            }
+            else
+            {
+                for ( final UUID versionId : entry.getValue() )
+                {
+                    deleteObjects.add( new DeleteObject( entry.getKey(), versionId ) );
+                }
+            }
         }
 
         delete.setDeleteObjectList(deleteObjects);
@@ -112,7 +114,10 @@ public HttpVerb getVerb() {
     public String getPath() {
         return "/" + this.bucketName;
     }
-    public List<String> getObjects() {
+    
+    
+    public Map< String, Set< UUID > > getObjects()
+    {
         return this.objects;
     }
 
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/models/DeleteObjectError.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/models/DeleteObjectError.java
@@ -19,6 +19,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import java.lang.String;
+import java.util.UUID;
 
 @JacksonXmlRootElement(namespace = "Data")
 public class DeleteObjectError {
@@ -30,6 +31,9 @@ public class DeleteObjectError {
     @JsonProperty("Key")
     private String key;
 
+    @JsonProperty("VersionId")
+    private UUID versionId;
+
     @JsonProperty("Message")
     private String message;
 
@@ -56,8 +60,19 @@ public String getKey() {
     public void setKey(final String key) {
         this.key = key;
     }
-
-
+    
+    
+    public UUID getVersionId()
+    {
+        return versionId;
+    }
+    
+    public void setVersionId( final UUID versionId )
+    {
+        this.versionId = versionId;
+    }
+    
+    
     public String getMessage() {
         return this.message;
     }
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/models/delete/DeleteObject.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/models/delete/DeleteObject.java
@@ -1,14 +1,20 @@
 package com.spectralogic.ds3client.models.delete;
 
+import java.util.UUID;
+
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class DeleteObject {
 
     @JsonProperty("Key")
     private String key;
-
-    public DeleteObject(final String key) {
+    
+    @JsonProperty("VersionId")
+    private UUID versionId;
+    
+    public DeleteObject(final String key, final UUID versionId) {
         this.key = key;
+        this.versionId = versionId;
     }
 
     public String getKey() {
@@ -18,4 +24,16 @@ public String getKey() {
     public void setKey(final String key) {
         this.key = key;
     }
+    
+    
+    public UUID getVersionId()
+    {
+        return versionId;
+    }
+    
+    
+    public void setVersionId( final UUID versionId )
+    {
+        this.versionId = versionId;
+    }
 }
diff --git a/ds3-sdk/src/test/java/com/spectralogic/ds3client/Ds3Client_Test.java b/ds3-sdk/src/test/java/com/spectralogic/ds3client/Ds3Client_Test.java
@@ -15,8 +15,21 @@
 
 package com.spectralogic.ds3client;
 
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.nio.channels.FileChannel;
+import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.StandardOpenOption;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+import org.junit.Before;
+import org.junit.Test;
+
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import com.google.common.collect.TreeMultimap;
 import com.spectralogic.ds3client.commands.*;
@@ -31,20 +44,6 @@
 import com.spectralogic.ds3client.networking.HttpVerb;
 import com.spectralogic.ds3client.utils.ByteArraySeekableByteChannel;
 import com.spectralogic.ds3client.utils.ResourceUtils;
-import org.junit.Before;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.nio.channels.FileChannel;
-import java.nio.charset.Charset;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.StandardOpenOption;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
 import static org.hamcrest.CoreMatchers.*;
 import static org.hamcrest.MatcherAssert.assertThat;
 
@@ -311,10 +310,17 @@ public void deleteObject() throws IOException {
 
     @Test
     public void multiObjectDelete() throws IOException {
-        final List<String> objsToDelete = Lists.newArrayList("sample1.txt", "sample2.txt");
+        final Map< String, Set< UUID > > objsToDelete = new LinkedHashMap<>();
+        final UUID uuid1 = UUID.randomUUID();
+        objsToDelete.put( "sample1.txt", new HashSet<>( Collections.singletonList( uuid1 ) ) );
+        final UUID uuid2 = UUID.randomUUID();
+        objsToDelete.put( "sample2.txt", new HashSet<>( Collections.singletonList( uuid2 ) ) );
         final Map<String, String> queryParams = new HashMap<>();
         queryParams.put("delete", null);
-        final String payload = "<Delete><Quiet>false</Quiet><Object><Key>sample1.txt</Key></Object><Object><Key>sample2.txt</Key></Object></Delete>";
+        final String payload =
+                "<Delete><Quiet>false</Quiet><Object><Key>sample1.txt</Key><VersionId>" + uuid1.toString() +
+                        "</VersionId></Object><Object><Key>sample2.txt</Key><VersionId>" + uuid2.toString() +
+                        "</VersionId></Object></Delete>";
 
         final DeleteObjectsResponse response = MockNetwork
             .expecting(HttpVerb.POST, "/bucketName", queryParams, payload)
@@ -325,15 +331,16 @@ public void multiObjectDelete() throws IOException {
                 "  <Error>\n" +
                 "    <Key>sample2.txt</Key>\n" +
                 "    <Code>AccessDenied</Code>\n" +
-                "    <Message>Access Denied</Message>\n" +
+                "    <Message>Access Denied</Message>\n" + "    <VersionId>" + uuid2 + "</VersionId>\n" +
                 "  </Error>\n" +
                 "</DeleteResult>")
             .asClient()
             .deleteObjects(new DeleteObjectsRequest("bucketName", objsToDelete));
         assertThat(response.getDeleteResult().getDeletedObjects().size(), is(1));
         assertThat(response.getDeleteResult().getErrors().size(), is(1));
     }
-
+    
+    
     @Test(expected = FailedRequestException.class)
     public void getBadBucket() throws IOException {
         MockNetwork

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`
`16`	`16`	`allprojects {`
`17`	`17`	`group = 'com.spectralogic.ds3'`
`18`		`- version = '3.2.8-COMPAT-2'`
	`18`	`+ version = '3.2.8-COMPAT-3'`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`subprojects {`