Merge pull request #139 from rpmoore/empty_object

Empty object

Author: Denver

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

@@ -5,23 +5,28 @@
 import com.spectralogic.ds3client.Ds3Client;
 import com.spectralogic.ds3client.commands.CancelJobRequest;
 import com.spectralogic.ds3client.commands.CancelJobResponse;
+import com.spectralogic.ds3client.commands.GetAvailableJobChunksRequest;
 import com.spectralogic.ds3client.helpers.Ds3ClientHelpers;
 import com.spectralogic.ds3client.models.Contents;
 import com.spectralogic.ds3client.models.bulk.Ds3Object;
+import com.spectralogic.ds3client.networking.FailedRequestException;
 import com.spectralogic.ds3client.serializer.XmlProcessingException;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.io.IOException;
+import java.nio.channels.SeekableByteChannel;
 import java.security.SignatureException;
+import java.util.Collections;
 import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.*;
 
 public class Regression_Test {
 
@@ -205,4 +210,40 @@ public void testPrefixForNestedDirectories() throws IOException, SignatureExcept
             Util.deleteAllContents(client, bucketName);
         }
     }
+
+    @Test
+    public void emptyObjectTest() throws IOException, SignatureException, XmlProcessingException {
+        Util.assumeVersion1_2(client);
+        final String bucketName = "emptyObject";
+        final List<Ds3Object> objects = Collections.singletonList(new Ds3Object("obj1.txt", 0));
+
+        try {
+
+            final Ds3ClientHelpers helpers = Ds3ClientHelpers.wrap(client);
+
+            helpers.ensureBucketExists(bucketName);
+
+            final Ds3ClientHelpers.Job job = helpers.startWriteJob(bucketName, objects);
+
+            assertThat(job, is(notNullValue()));
+
+            try {
+                client.getAvailableJobChunks(new GetAvailableJobChunksRequest(job.getJobId()));
+                fail();
+            } catch(final FailedRequestException e) {
+                assertThat(e.getStatusCode(), is(404)); // this returns 410 in bp 3.0
+            }
+
+            job.transfer(new Ds3ClientHelpers.ObjectChannelBuilder() {
+                @Override
+                public SeekableByteChannel buildChannel(final String key) throws IOException {
+                    fail("This call should never be hit");
+                    return new NullChannel();
+                }
+            });
+        } finally {
+            Util.deleteAllContents(client, bucketName);
+        }
+
+    }
 }

ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/JobImpl.java

@@ -33,11 +33,17 @@ public JobImpl(final Ds3Client client, final MasterObjectList masterObjectList)
 
     @Override
     public UUID getJobId() {
+        if (this.masterObjectList == null) {
+            return null;
+        }
         return this.masterObjectList.getJobId();
     }
 
     @Override
     public String getBucketName() {
+        if (this.masterObjectList == null) {
+            return null;
+        }
         return this.masterObjectList.getBucketName();
     }
 

ds3-sdk/src/main/java/com/spectralogic/ds3client/helpers/WriteJobImpl.java

@@ -47,8 +47,8 @@ public WriteJobImpl(
             final Ds3Client client,
             final MasterObjectList masterObjectList) {
         super(client, masterObjectList);
-        if (masterObjectList == null) {
-            LOG.info("An empty job was created");
+        if (this.masterObjectList == null || this.masterObjectList.getObjects() == null) {
+            LOG.info("Job has no data to transfer");
             this.filteredChunks = null;
             this.partTracker = null;
         } else {
@@ -86,8 +86,8 @@ public void removeObjectCompletedListener(final ObjectCompletedListener listener
     public void transfer(final ObjectChannelBuilder channelBuilder)
             throws SignatureException, IOException, XmlProcessingException {
         LOG.debug("Starting job transfer");
-        if (masterObjectList == null) {
-            LOG.info("There is nothing to transfer");
+        if (this.masterObjectList == null || this.masterObjectList.getObjects() == null) {
+            LOG.info("There is nothing to transfer for job" + ((this.getJobId() == null) ? "" : " " + this.getJobId().toString()));
             return;
         }
         try (final JobState jobState = new JobState(channelBuilder, filteredChunks, partTracker, ImmutableMap.<String, ImmutableMultimap<BulkObject,Range>>of())) {

ds3-sdk/src/main/java/com/spectralogic/ds3client/serializer/XmlOutput.java

@@ -22,7 +22,6 @@
 import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
 import com.fasterxml.jackson.dataformat.xml.JacksonXmlModule;
 import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-import com.spectralogic.ds3client.BulkCommand;
 import com.spectralogic.ds3client.models.bulk.Ds3ObjectList;
 
 import java.io.IOException;
@@ -44,21 +43,18 @@ public class XmlOutput {
         module.setDefaultUseWrapper(false);
         mapper = new XmlMapper(module);
         final SimpleFilterProvider filterProvider = new SimpleFilterProvider().setFailOnUnknownId(false);
-        mapper.setFilters(filterProvider);
+        mapper.setFilterProvider(filterProvider);
         if (isProductionBuild()) {
             mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         } else {
-            LOG.info("Non-production build: Asserting on Deserializing invalid XML elements in responses.");
+            LOG.info("Non-production build: Asserting on de-serializing unknown elements and attributes in XML response payloads.");
         }
     }
 
     protected static boolean isProductionBuild() {
         String productionBuild = System.getenv(PRODUCTION_BUILD);
         if (productionBuild != null) {
-            if (productionBuild.equals("true")) {
-                return true;
-            }
-            return false;
+            return productionBuild.equals("true");
         }
 
         final Properties props = new Properties();
@@ -74,7 +70,7 @@ protected static boolean isProductionBuild() {
                     return true;
                 }
                 else {
-                    LOG.error("Unknown productionBuild value[" + productionBuild + "].  Defaulting to fail for unknown XML elements.");
+                    LOG.error("Unknown productionBuild value[" + productionBuild + "].  Defaulting to false for unknown XML elements.");
                 }
             } catch (final IOException e) {
                 LOG.error("Failed to load property file: ", e);