Resolving some issues identified during code review.

Author: rpmoore

src/main/java/com/spectralogic/ds3client/NetworkClientImpl.java

@@ -85,12 +85,7 @@ private class RequestExecutor implements Closeable {
         public RequestExecutor(final Ds3Request ds3Request) throws IOException {
             this.ds3Request = ds3Request;
             this.host = this.buildHost();
-            try {
-                this.content = ds3Request.getStream();
-            }
-            catch(final XmlProcessingException e) {
-                throw new RuntimeException(e);
-            }
+            this.content = ds3Request.getStream();
             if (this.content != null && !this.content.markSupported()) {
                 throw new RequiresMarkSupportedException();
             }

src/main/java/com/spectralogic/ds3client/commands/AbstractRequest.java

@@ -16,7 +16,6 @@
 package com.spectralogic.ds3client.commands;
 
 import com.spectralogic.ds3client.models.Checksum;
-import com.spectralogic.ds3client.serializer.XmlProcessingException;
 import org.apache.http.entity.ContentType;
 
 import java.io.InputStream;
@@ -40,7 +39,7 @@ public ContentType getContentType() {
     }
 
     @Override
-    public InputStream getStream() throws XmlProcessingException {
+    public InputStream getStream() {
         return null;
     }
 

src/main/java/com/spectralogic/ds3client/commands/BulkRequest.java

@@ -52,7 +52,7 @@ public BulkRequest withWriteOptimization(final WriteOptimization writeOptimizati
         return this;
     }
 
-    private InputStream generateStream() throws XmlProcessingException {
+    private InputStream generateStream() {
         final Ds3ObjectList objects =
                 new Ds3ObjectList();
         objects.setObjects(this.ds3Objects);
@@ -91,7 +91,7 @@ public HttpVerb getVerb() {
     public abstract BulkCommand getCommand ();
 
     @Override
-    public InputStream getStream() throws XmlProcessingException {
+    public InputStream getStream() {
         if (this.stream == null) {
             this.stream = generateStream();
         }

src/main/java/com/spectralogic/ds3client/commands/Ds3Request.java

@@ -17,7 +17,6 @@
 
 import com.spectralogic.ds3client.HttpVerb;
 import com.spectralogic.ds3client.models.Checksum;
-import com.spectralogic.ds3client.serializer.XmlProcessingException;
 import org.apache.http.entity.ContentType;
 
 import java.io.InputStream;
@@ -30,7 +29,7 @@ public interface Ds3Request {
 
     public ContentType getContentType();
 
-    public InputStream getStream() throws XmlProcessingException;
+    public InputStream getStream();
 
     public long getSize();
 

src/main/java/com/spectralogic/ds3client/networking/NetworkClient.java

@@ -16,7 +16,6 @@
 package com.spectralogic.ds3client.networking;
 
 import com.spectralogic.ds3client.commands.Ds3Request;
-import com.spectralogic.ds3client.serializer.XmlProcessingException;
 
 import java.io.IOException;
 import java.security.SignatureException;

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

@@ -38,11 +38,11 @@ public class XmlOutput {
         mapper.setFilters(filterProvider);
     }
 
-    public static String toXml(final Object object) throws XmlProcessingException {
+    public static String toXml(final Object object) {
         return toXml(object, null);
     }
 
-    private static String toXml(final Object object, final FilterProvider filterProvider) throws XmlProcessingException {
+    private static String toXml(final Object object, final FilterProvider filterProvider) {
         try {
             if (filterProvider == null) {
                 return mapper.writeValueAsString(object);
@@ -51,12 +51,12 @@ private static String toXml(final Object object, final FilterProvider filterProv
                 return mapper.writer(filterProvider).writeValueAsString(object);
             }
         }
-        catch(JsonProcessingException e) {
-            throw new XmlProcessingException(e);
+        catch(final JsonProcessingException e) {
+            throw new RuntimeException(new XmlProcessingException(e));
         }
     }
 
-    public static String toXml(final Ds3ObjectList objects, final BulkCommand command) throws XmlProcessingException {
+    public static String toXml(final Ds3ObjectList objects, final BulkCommand command) {
         if (command == BulkCommand.GET) {
             final FilterProvider filters = new SimpleFilterProvider().addFilter("sizeFilter",
                     SimpleBeanPropertyFilter.serializeAllExcept("Size"));

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

@@ -79,14 +79,9 @@ public WebResponse getResponse(final Ds3Request request)
             this.assertMapsEqual(this.queryParams, request.getQueryParams());
         }
         if (this.requestContent != null) {
-            try {
-                final InputStream stream = request.getStream();
-                assertThat(stream, is(notNullValue()));
-                assertThat(IOUtils.toString(stream), is(this.requestContent));
-            }
-            catch(final XmlProcessingException e) {
-                fail("Received an xml processing exception.");
-            }
+            final InputStream stream = request.getStream();
+            assertThat(stream, is(notNullValue()));
+            assertThat(IOUtils.toString(stream), is(this.requestContent));
         }
         return new MockedWebResponse(this.responseContent, this.statusCode);
     }