You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2012/12/27 14:30:53 UTC
svn commit: r1426195 - in
/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl:
builder/CustomBuilderTest.java serializer/OMSerializerTest.java
Author: veithen
Date: Thu Dec 27 13:30:53 2012
New Revision: 1426195
URL: http://svn.apache.org/viewvc?rev=1426195&view=rev
Log:
Create builders directly from byte stream instead of creating an XMLStreamReader first.
Modified:
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/builder/CustomBuilderTest.java
webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/builder/CustomBuilderTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/builder/CustomBuilderTest.java?rev=1426195&r1=1426194&r2=1426195&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/builder/CustomBuilderTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/builder/CustomBuilderTest.java Thu Dec 27 13:30:53 2012
@@ -23,11 +23,11 @@ import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.OMNode;
import org.apache.axiom.om.OMSourcedElement;
+import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.TestConstants;
import org.apache.axiom.om.ds.ByteArrayDataSource;
import org.apache.axiom.om.ds.custombuilder.ByteArrayCustomBuilder;
import org.apache.axiom.om.util.CopyUtils;
-import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAPBody;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
@@ -36,7 +36,6 @@ import org.apache.axiom.soap.SOAPHeaderB
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamReader;
import java.io.InputStream;
import java.util.ArrayList;
@@ -53,9 +52,8 @@ public class CustomBuilderTest extends A
public void testHeaderCustomBuilder() throws Exception{
- XMLStreamReader parser =
- StAXUtils.createXMLStreamReader(getTestResource(TestConstants.SOAP_SOAPMESSAGE));
- StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(parser, null);
+ StAXSOAPModelBuilder builder = (StAXSOAPModelBuilder)OMXMLBuilderFactory.createSOAPModelBuilder(
+ getTestResource(TestConstants.SOAP_SOAPMESSAGE), null);
builder.registerCustomBuilder(new QName("http://schemas.xmlsoap.org/ws/2004/03/addressing","To"), 3, new
ByteArrayCustomBuilder("utf-8"));
SOAPEnvelope sourceEnv = (SOAPEnvelope) builder.getDocumentElement();
@@ -137,8 +135,7 @@ public class CustomBuilderTest extends A
* @throws Exception
*/
protected SOAPEnvelope createEnvelope(InputStream in) throws Exception {
- XMLStreamReader parser = StAXUtils.createXMLStreamReader(in);
- StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(parser, null);
+ StAXSOAPModelBuilder builder = (StAXSOAPModelBuilder)OMXMLBuilderFactory.createSOAPModelBuilder(in, null);
builder.registerCustomBuilderForPayload(new ByteArrayCustomBuilder("utf-8"));
return (SOAPEnvelope) builder.getDocumentElement();
}
Modified: webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java
URL: http://svn.apache.org/viewvc/webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java?rev=1426195&r1=1426194&r2=1426195&view=diff
==============================================================================
--- webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java (original)
+++ webservices/commons/trunk/modules/axiom/modules/axiom-tests/src/test/java/org/apache/axiom/om/impl/serializer/OMSerializerTest.java Thu Dec 27 13:30:53 2012
@@ -145,12 +145,9 @@ public class OMSerializerTest extends Ab
* @throws Exception
*/
public void testElementPullStreamAndOMExpansion() throws Exception {
- // Create a reader sourced from a message containing an interesting payload
- XMLStreamReader reader = StAXUtils.createXMLStreamReader(getTestResource("soap/OMElementTest.xml"));
-
- // Create a builder connected to the reader
- StAXBuilder builder = (StAXBuilder)OMXMLBuilderFactory.createStAXSOAPModelBuilder(
- reader);
+ // Create a builder from a message containing an interesting payload
+ StAXBuilder builder = (StAXBuilder)OMXMLBuilderFactory.createSOAPModelBuilder(
+ getTestResource("soap/OMElementTest.xml"), null);
// Create a custom builder to store the sub trees as a byte array instead of a full tree
ByteArrayCustomBuilder customBuilder = new ByteArrayCustomBuilder("utf-8");
@@ -200,12 +197,9 @@ public class OMSerializerTest extends Ab
* @throws Exception
*/
public void testElementPullStreamAndOMExpansion2() throws Exception {
- // Create a reader sourced from a message containing an interesting payload
- XMLStreamReader reader = StAXUtils.createXMLStreamReader(getTestResource("soap/soapmessageWithXSI.xml"));
-
- // Create a builder connected to the reader
- StAXBuilder builder = (StAXBuilder)OMXMLBuilderFactory.createStAXSOAPModelBuilder(
- reader);
+ // Create a builder from a message containing an interesting payload
+ StAXBuilder builder = (StAXBuilder)OMXMLBuilderFactory.createSOAPModelBuilder(
+ getTestResource("soap/soapmessageWithXSI.xml"), null);
// Create a custom builder to store the sub trees as a byte array instead of a full tree
ByteArrayCustomBuilder customBuilder = new ByteArrayCustomBuilder("utf-8");
@@ -251,12 +245,9 @@ public class OMSerializerTest extends Ab
* @throws Exception
*/
public void testElementPullStreamAndOMExpansion3() throws Exception {
- // Create a reader sourced from a message containing an interesting payload
- XMLStreamReader reader = StAXUtils.createXMLStreamReader(getTestResource("soap/noprettyprint.xml"));
-
- // Create a builder connected to the reader
- StAXBuilder builder = (StAXBuilder)OMXMLBuilderFactory.createStAXSOAPModelBuilder(
- reader);
+ // Create a builder from a message containing an interesting payload
+ StAXBuilder builder = (StAXBuilder)OMXMLBuilderFactory.createSOAPModelBuilder(
+ getTestResource("soap/noprettyprint.xml"), null);
// Create a custom builder to store the sub trees as a byte array instead of a full tree
ByteArrayCustomBuilder customBuilder = new ByteArrayCustomBuilder("utf-8");