Author: veithen
Date: Fri Feb 7 15:17:14 2014
New Revision: 1565680
URL: http://svn.apache.org/r1565680
Log:
Added a getSOAPMessage() method to SOAPModelBuilder. This basically adds the
StAXSOAPModelBuilder#getSoapMessage() method to the public API, but with a more
consistent name.
Modified:
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPModelBuilder.java
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetCharsetEncodingWithParser.java
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
Modified:
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPModelBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPModelBuilder.java?rev=1565680&r1=1565679&r2=1565680&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPModelBuilder.java
(original)
+++
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/soap/SOAPModelBuilder.java
Fri Feb 7 15:17:14 2014
@@ -25,9 +25,19 @@ import org.apache.axiom.om.OMXMLParserWr
*/
public interface SOAPModelBuilder extends OMXMLParserWrapper {
/**
- * Get the SOAP envelope for the document processed by this builder.
+ * Get the SOAP envelope for the document processed by this builder. This
is a convenience
+ * method that has the same return value as {@link
OMXMLParserWrapper#getDocumentElement()}
+ * but a different return type.
*
* @return the SOAP envelope
*/
SOAPEnvelope getSOAPEnvelope();
+
+ /**
+ * Get the SOAP message being built by this builder. This is a convenience
method that has the
+ * same return value as {@link OMXMLParserWrapper#getDocument()} but a
different return type.
+ *
+ * @return the SOAP message
+ */
+ SOAPMessage getSOAPMessage();
}
Modified:
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java?rev=1565680&r1=1565679&r2=1565680&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
(original)
+++
webservices/axiom/trunk/modules/axiom-api/src/main/java/org/apache/axiom/soap/impl/builder/StAXSOAPModelBuilder.java
Fri Feb 7 15:17:14 2014
@@ -344,7 +344,14 @@ public class StAXSOAPModelBuilder extend
return getSOAPEnvelope().getNamespace();
}
+ /**
+ * @deprecated Use {@link SOAPModelBuilder#getSOAPMessage()} instead.
+ */
public SOAPMessage getSoapMessage() {
+ return getSOAPMessage();
+ }
+
+ public SOAPMessage getSOAPMessage() {
return (SOAPMessage)getDocument();
}
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java?rev=1565680&r1=1565679&r2=1565680&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/builder/TestCommentInProlog.java
Fri Feb 7 15:17:14 2014
@@ -34,7 +34,7 @@ public class TestCommentInProlog extends
}
protected void runTest() throws Throwable {
- SOAPMessage message =
(SOAPMessage)getBuilderForTestMessage(SOAP_MESSAGE).getDocument();
+ SOAPMessage message =
getBuilderForTestMessage(SOAP_MESSAGE).getSOAPMessage();
OMNode firstChild = message.getFirstOMChild();
assertTrue(firstChild instanceof OMComment);
}
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java?rev=1565680&r1=1565679&r2=1565680&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestCloneIncomplete.java
Fri Feb 7 15:17:14 2014
@@ -41,7 +41,7 @@ public class TestCloneIncomplete extends
}
protected void runTest() throws Throwable {
- SOAPMessage message =
(SOAPMessage)getBuilderForTestMessage(SOAP_MESSAGE).getDocument();
+ SOAPMessage message =
getBuilderForTestMessage(SOAP_MESSAGE).getSOAPMessage();
OMCloneOptions options = new OMCloneOptions();
options.setPreserveModel(preserveModel);
OMInformationItem clone = message.clone(options);
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetCharsetEncodingWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetCharsetEncodingWithParser.java?rev=1565680&r1=1565679&r2=1565680&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetCharsetEncodingWithParser.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetCharsetEncodingWithParser.java
Fri Feb 7 15:17:14 2014
@@ -46,8 +46,8 @@ public class TestGetCharsetEncodingWithP
OMOutputFormat format = new OMOutputFormat();
format.setCharSetEncoding(encoding);
orgEnvelope.serialize(baos, format);
- SOAPMessage message =
(SOAPMessage)OMXMLBuilderFactory.createSOAPModelBuilder(metaFactory,
- new ByteArrayInputStream(baos.toByteArray()),
encoding).getDocument();
+ SOAPMessage message =
OMXMLBuilderFactory.createSOAPModelBuilder(metaFactory,
+ new ByteArrayInputStream(baos.toByteArray()),
encoding).getSOAPMessage();
assertEquals(encoding, message.getCharsetEncoding());
}
}
Modified:
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
URL:
http://svn.apache.org/viewvc/webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java?rev=1565680&r1=1565679&r2=1565680&view=diff
==============================================================================
---
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
(original)
+++
webservices/axiom/trunk/modules/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap/message/TestGetOMFactoryWithParser.java
Fri Feb 7 15:17:14 2014
@@ -36,7 +36,7 @@ public class TestGetOMFactoryWithParser
}
protected void runTest() throws Throwable {
- SOAPMessage message =
(SOAPMessage)getBuilderForTestMessage(SOAP_MESSAGE).getDocument();
+ SOAPMessage message =
getBuilderForTestMessage(SOAP_MESSAGE).getSOAPMessage();
assertSame(soapFactory, message.getOMFactory());
}
}
