Merge pull request #28 from rpmoore/master

Adding back in the size filter.  Updating tests to reflect the change.

Author: hansdude

src/main/java/com/spectralogic/ds3client/models/bulk/Ds3Object.java

@@ -15,8 +15,10 @@
 
 package com.spectralogic.ds3client.models.bulk;
 
+import com.fasterxml.jackson.annotation.JsonFilter;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
 
+@JsonFilter("sizeFilter")
 public class Ds3Object  {
     @JacksonXmlProperty(isAttribute = true, localName = "Name")
     private String name;

src/main/java/com/spectralogic/ds3client/serializer/XmlOutput.java

@@ -42,7 +42,7 @@ public static String toXml(final Object object) throws XmlProcessingException {
         return toXml(object, null);
     }
 
-    public static String toXml(final Object object, final FilterProvider filterProvider) throws XmlProcessingException {
+    private static String toXml(final Object object, final FilterProvider filterProvider) throws XmlProcessingException {
         try {
             if (filterProvider == null) {
                 return mapper.writeValueAsString(object);
@@ -57,13 +57,11 @@ public static String toXml(final Object object, final FilterProvider filterProvi
     }
 
     public static String toXml(final Ds3ObjectList objects, final BulkCommand command) throws XmlProcessingException {
-        /*
         if (command == BulkCommand.GET) {
             final FilterProvider filters = new SimpleFilterProvider().addFilter("sizeFilter",
-                    SimpleBeanPropertyFilter.serializeAllExcept("size"));
+                    SimpleBeanPropertyFilter.serializeAllExcept("Size"));
             return XmlOutput.toXml(objects, filters);
         }
-        */
         return XmlOutput.toXml(objects);
     }
 

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

@@ -270,7 +270,15 @@ public void runBulkTest(final BulkCommand command, final BulkTestDriver driver)
             new Ds3Object("file3", 2523)
         );
 
-        final String expectedXmlBody = "<Objects><Object Name=\"file1\" Size=\"256\"/><Object Name=\"file2\" Size=\"1202\"/><Object Name=\"file3\" Size=\"2523\"/></Objects>";
+        final String expectedXmlBody;
+
+        if (command == BulkCommand.GET) {
+            expectedXmlBody = "<Objects><Object Name=\"file1\"/><Object Name=\"file2\"/><Object Name=\"file3\"/></Objects>";
+        }
+        else {
+            expectedXmlBody = "<Objects><Object Name=\"file1\" Size=\"256\"/><Object Name=\"file2\" Size=\"1202\"/><Object Name=\"file3\" Size=\"2523\"/></Objects>";
+        }
+
         final String xmlResponse = "<MasterObjectList BucketName=\"lib\" JobId=\"9652a41a-218a-4158-af1b-064ab9e4ef71\" Priority=\"NORMAL\" RequestType=\"PUT\" StartDate=\"2014-07-29T16:08:39.000Z\"><Nodes><Node EndPoint=\"FAILED_TO_DETERMINE_DATAPATH_IP_ADDRESS\" HttpPort=\"80\" HttpsPort=\"443\" Id=\"b18ee082-1352-11e4-945e-080027ebeb6d\"/></Nodes><Objects ChunkId=\"cfa3153f-57de-41c7-b1fb-f30fa4154232\" ChunkNumber=\"0\"><Object Name=\"file2\" InCache=\"false\" Length=\"1202\" Offset=\"0\"/><Object Name=\"file1\" InCache=\"false\" Length=\"256\" Offset=\"0\"/><Object Name=\"file3\" InCache=\"false\" Length=\"2523\" Offset=\"0\"/></Objects></MasterObjectList>";
 
         final Map<String, String> queryParams = new HashMap<>();

src/test/java/com/spectralogic/ds3client/serializer/XmlOutput_Test.java

@@ -15,11 +15,10 @@
 
 package com.spectralogic.ds3client.serializer;
 
-import com.spectralogic.ds3client.models.bulk.BulkObject;
-import com.spectralogic.ds3client.models.bulk.Ds3Object;
+import com.google.common.collect.ImmutableList;
+import com.spectralogic.ds3client.BulkCommand;
+import com.spectralogic.ds3client.models.bulk.*;
 import com.spectralogic.ds3client.models.ListBucketResult;
-import com.spectralogic.ds3client.models.bulk.MasterObjectList;
-import com.spectralogic.ds3client.models.bulk.Objects;
 import org.junit.Test;
 
 import java.io.IOException;
@@ -64,4 +63,25 @@ public void bucketListWithEmptyContents() throws IOException {
         assertThat(result, is(notNullValue()));
         assertThat(result.getContentsList(), is(notNullValue()));
     }
+
+    @Test
+    public void toXmlWithNoFilter() throws XmlProcessingException {
+        final String expectedString = "<Objects><Object Name=\"file1\" Size=\"12\"/><Object Name=\"file2\" Size=\"5022\"/></Objects>";
+        final List<Ds3Object> objectList = ImmutableList.of(new Ds3Object("file1", 12), new Ds3Object("file2", 5022)).asList();
+        final Ds3ObjectList ds3ObjectList = new Ds3ObjectList(objectList);
+        final String result = XmlOutput.toXml(ds3ObjectList, BulkCommand.PUT);
+
+        assertThat(result, is(expectedString));
+    }
+
+    @Test
+    public void toXmlWithFilter() throws XmlProcessingException {
+        final String expectedString = "<Objects><Object Name=\"file1\"/><Object Name=\"file2\"/></Objects>";
+        final List<Ds3Object> objectList = ImmutableList.of(new Ds3Object("file1", 12), new Ds3Object("file2", 5022)).asList();
+        final Ds3ObjectList ds3ObjectList = new Ds3ObjectList(objectList);
+        final String result = XmlOutput.toXml(ds3ObjectList, BulkCommand.GET);
+
+        assertThat(result, is(expectedString));
+
+    }
 }