Updated to the latest version of our xml processing dependencies. Changed the way most places parse the xml bodies. Instead of reading the xml body all into memory at once, the SDK will now stream the contents to the xml parsing library which should improve performance in most cases.

rpmoore · rpmoore · commit 8c073ff3f7f4 · 2015-05-18T17:02:41.000-06:00
diff --git a/build.gradle b/build.gradle
@@ -15,7 +15,7 @@
 
 allprojects {
     group = 'com.spectralogic.ds3'
-    version = '1.1.0-RC5'
+    version = '1.1.0-RC6'
 }
 
 subprojects {
diff --git a/ds3-sdk/build.gradle b/ds3-sdk/build.gradle
@@ -43,8 +43,8 @@ dependencies {
     compile     'org.apache.httpcomponents:httpclient:4.3.2'
     compile     'commons-codec:commons-codec:1.10'
     compile     'commons-io:commons-io:2.1'
-    compile     'org.codehaus.woodstox:woodstox-core-asl:4.2.0'
-    compile     'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.5.0'
+    compile     'org.codehaus.woodstox:woodstox-core-asl:4.4.1'
+    compile     'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.5.3'
     compile     'com.google.guava:guava:18.0'
     testCompile 'org.hamcrest:hamcrest-library:1.3'
 }
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/AllocateJobChunkResponse.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/AllocateJobChunkResponse.java
@@ -19,11 +19,8 @@
 import com.spectralogic.ds3client.networking.WebResponse;
 import com.spectralogic.ds3client.serializer.XmlOutput;
 
-import org.apache.commons.io.IOUtils;
-
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringWriter;
 
 public class AllocateJobChunkResponse extends AbstractResponse {
     private Status status;
@@ -70,10 +67,8 @@ protected void processResponse() throws IOException {
     }
 
     private static Objects parseChunk(final WebResponse webResponse) throws IOException {
-        try (final InputStream content = webResponse.getResponseStream();
-             final StringWriter writer = new StringWriter()) {
-            IOUtils.copy(content, writer, UTF8);
-            return XmlOutput.fromXml(writer.toString(), Objects.class);
+        try (final InputStream content = webResponse.getResponseStream()) {
+            return XmlOutput.fromXml(content, Objects.class);
         }
     }
 
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/DeleteMultipleObjectsResponse.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/DeleteMultipleObjectsResponse.java
@@ -18,11 +18,9 @@
 import com.spectralogic.ds3client.models.delete.DeleteResult;
 import com.spectralogic.ds3client.networking.WebResponse;
 import com.spectralogic.ds3client.serializer.XmlOutput;
-import org.apache.commons.io.IOUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringWriter;
 
 public class DeleteMultipleObjectsResponse extends AbstractResponse {
 
@@ -40,10 +38,8 @@ public DeleteResult getResult() {
     protected void processResponse() throws IOException {
         try {
             this.checkStatusCode(200);
-            try (final InputStream content = getResponse().getResponseStream();
-                 final StringWriter writer = new StringWriter()) {
-                IOUtils.copy(content, writer, UTF8);
-                this.result = XmlOutput.fromXml(writer.toString(), DeleteResult.class);
+            try (final InputStream content = getResponse().getResponseStream()) {
+                this.result = XmlOutput.fromXml(content, DeleteResult.class);
             }
         } finally {
             this.getResponse().close();
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetAvailableJobChunksResponse.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetAvailableJobChunksResponse.java
@@ -19,11 +19,8 @@
 import com.spectralogic.ds3client.networking.WebResponse;
 import com.spectralogic.ds3client.serializer.XmlOutput;
 
-import org.apache.commons.io.IOUtils;
-
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringWriter;
 
 public class GetAvailableJobChunksResponse extends AbstractResponse {
     private Status status;
@@ -71,10 +68,8 @@ protected void processResponse() throws IOException {
     }
 
     private static MasterObjectList parseMasterObjectList(final WebResponse webResponse) throws IOException {
-        try (final InputStream content = webResponse.getResponseStream();
-             final StringWriter writer = new StringWriter()) {
-            IOUtils.copy(content, writer, UTF8);
-            return XmlOutput.fromXml(writer.toString(), MasterObjectList.class);
+        try (final InputStream content = webResponse.getResponseStream()) {
+            return XmlOutput.fromXml(content, MasterObjectList.class);
         }
     }
 
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetBucketResponse.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetBucketResponse.java
@@ -19,15 +19,14 @@
 import com.spectralogic.ds3client.models.ListBucketResult;
 import com.spectralogic.ds3client.networking.WebResponse;
 import com.spectralogic.ds3client.serializer.XmlOutput;
-
-import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringWriter;
 
 public class GetBucketResponse extends AbstractResponse {
-
+    private final static Logger LOG = LoggerFactory.getLogger(GetBucketResponse.class);
     private ListBucketResult result;
 
     public GetBucketResponse(final WebResponse response) throws IOException {
@@ -44,9 +43,9 @@ protected void processResponse() throws IOException {
         try (final WebResponse response = this.getResponse();
              final InputStream contentStream = response.getResponseStream()) {
             this.checkStatusCode(200);
-            final StringWriter writer = new StringWriter();
-            IOUtils.copy(contentStream, writer, UTF8);
-            this.result = XmlOutput.fromXml(writer.toString(), ListBucketResult.class);
+            LOG.debug("Starting bucket xml parsing");
+            this.result = XmlOutput.fromXml(contentStream, ListBucketResult.class);
+            LOG.debug("Finished bucket xml parsing");
         }
     }
 }
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetJobResponse.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetJobResponse.java
@@ -45,10 +45,8 @@ public MasterObjectList getMasterObjectList() {
     }
 
     private static MasterObjectList parseMasterObjectList(final WebResponse webResponse) throws IOException {
-        try (final InputStream content = webResponse.getResponseStream();
-             final StringWriter writer = new StringWriter()) {
-            IOUtils.copy(content, writer, UTF8);
-            return XmlOutput.fromXml(writer.toString(), MasterObjectList.class);
+        try (final InputStream content = webResponse.getResponseStream()) {
+            return XmlOutput.fromXml(content, MasterObjectList.class);
         }
     }
 }
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetJobsResponse.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetJobsResponse.java
@@ -20,11 +20,8 @@
 import com.spectralogic.ds3client.networking.WebResponse;
 import com.spectralogic.ds3client.serializer.XmlOutput;
 
-import org.apache.commons.io.IOUtils;
-
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringWriter;
 import java.util.List;
 
 public class GetJobsResponse extends AbstractResponse {
@@ -47,10 +44,8 @@ public List<JobInfo> getJobs() {
     }
     
     private static Jobs parseJobs(final WebResponse webResponse) throws IOException {
-        try (final InputStream content = webResponse.getResponseStream();
-             final StringWriter writer = new StringWriter()) {
-            IOUtils.copy(content, writer, UTF8);
-            return XmlOutput.fromXml(writer.toString(), Jobs.class);
+        try (final InputStream content = webResponse.getResponseStream()) {
+            return XmlOutput.fromXml(content, Jobs.class);
         }
     }
     
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetServiceResponse.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/GetServiceResponse.java
@@ -19,11 +19,8 @@
 import com.spectralogic.ds3client.networking.WebResponse;
 import com.spectralogic.ds3client.serializer.XmlOutput;
 
-import org.apache.commons.io.IOUtils;
-
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringWriter;
 
 public class GetServiceResponse extends AbstractResponse {
 
@@ -41,10 +38,8 @@ public ListAllMyBucketsResult getResult() {
     protected void processResponse() throws IOException {
         try (final WebResponse response = this.getResponse()) {
             this.checkStatusCode(200);
-            try (final InputStream content = response.getResponseStream();
-                 final StringWriter writer = new StringWriter()) {
-                IOUtils.copy(content, writer, UTF8);
-                this.result = XmlOutput.fromXml(writer.toString(), ListAllMyBucketsResult.class);
+            try (final InputStream content = response.getResponseStream()) {
+                this.result = XmlOutput.fromXml(content, ListAllMyBucketsResult.class);
             }
         }
     }
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/ModifyJobResponse.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/ModifyJobResponse.java
@@ -19,11 +19,8 @@
 import com.spectralogic.ds3client.networking.WebResponse;
 import com.spectralogic.ds3client.serializer.XmlOutput;
 
-import org.apache.commons.io.IOUtils;
-
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringWriter;
 
 public class ModifyJobResponse extends AbstractResponse {
     private MasterObjectList masterObjectList;
@@ -45,10 +42,8 @@ public MasterObjectList getMasterObjectList() {
     }
 
     private static MasterObjectList parseMasterObjectList(final WebResponse webResponse) throws IOException {
-        try (final InputStream content = webResponse.getResponseStream();
-             final StringWriter writer = new StringWriter()) {
-            IOUtils.copy(content, writer, UTF8);
-            return XmlOutput.fromXml(writer.toString(), MasterObjectList.class);
+        try (final InputStream content = webResponse.getResponseStream()) {
+            return XmlOutput.fromXml(content, MasterObjectList.class);
         }
     }
 }
diff --git a/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/notifications/NotificationResponse.java b/ds3-sdk/src/main/java/com/spectralogic/ds3client/commands/notifications/NotificationResponse.java
@@ -19,11 +19,9 @@
 import com.spectralogic.ds3client.models.notification.NotificationRegistration;
 import com.spectralogic.ds3client.networking.WebResponse;
 import com.spectralogic.ds3client.serializer.XmlOutput;
-import org.apache.commons.io.IOUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringWriter;
 
 public class NotificationResponse extends AbstractResponse {
     private NotificationRegistration registration;
@@ -40,9 +38,7 @@ protected void processResponse() throws IOException {
             this.checkStatusCode(200, 201);
 
             try (final InputStream content = response.getResponseStream()) {
-                final StringWriter writer = new StringWriter();
-                IOUtils.copy(content, writer, UTF8);
-                this.registration = XmlOutput.fromXml(writer.toString(), NotificationRegistration.class);
+                this.registration = XmlOutput.fromXml(content, NotificationRegistration.class);
             }
         }
     }

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 = '1.1.0-RC5'`
	`18`	`+ version = '1.1.0-RC6'`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`subprojects {`
Original file line number	Diff line number	Diff line change
`@@ -45,10 +45,8 @@ public MasterObjectList getMasterObjectList() {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`private static MasterObjectList parseMasterObjectList(final WebResponse webResponse) throws IOException {`
`48`		`- try (final InputStream content = webResponse.getResponseStream();`
`49`		`- final StringWriter writer = new StringWriter()) {`
`50`		`- IOUtils.copy(content, writer, UTF8);`
`51`		`- return XmlOutput.fromXml(writer.toString(), MasterObjectList.class);`
	`48`	`+ try (final InputStream content = webResponse.getResponseStream()) {`
	`49`	`+ return XmlOutput.fromXml(content, MasterObjectList.class);`
`52`	`50`	`}`
`53`	`51`	`}`
`54`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,8 @@`
`19`	`19`	`import com.spectralogic.ds3client.networking.WebResponse;`
`20`	`20`	`import com.spectralogic.ds3client.serializer.XmlOutput;`
`21`	`21`
`22`		`-import org.apache.commons.io.IOUtils;`
`23`		`-`
`24`	`22`	`import java.io.IOException;`
`25`	`23`	`import java.io.InputStream;`
`26`		`-import java.io.StringWriter;`
`27`	`24`
`28`	`25`	`public class ModifyJobResponse extends AbstractResponse {`
`29`	`26`	`private MasterObjectList masterObjectList;`
`@@ -45,10 +42,8 @@ public MasterObjectList getMasterObjectList() {`
`45`	`42`	`}`
`46`	`43`
`47`	`44`	`private static MasterObjectList parseMasterObjectList(final WebResponse webResponse) throws IOException {`
`48`		`- try (final InputStream content = webResponse.getResponseStream();`
`49`		`- final StringWriter writer = new StringWriter()) {`
`50`		`- IOUtils.copy(content, writer, UTF8);`
`51`		`- return XmlOutput.fromXml(writer.toString(), MasterObjectList.class);`
	`45`	`+ try (final InputStream content = webResponse.getResponseStream()) {`
	`46`	`+ return XmlOutput.fromXml(content, MasterObjectList.class);`
`52`	`47`	`}`
`53`	`48`	`}`
`54`	`49`	`}`