Spring/spring-ws
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SWS-1003 - Eliminate some usages of deprecated Axiom APIs

Browse Source 
This change only addresses some trivial cases. There are other cases that require more work.
This commit is contained in:
Andreas Veithen
2017-05-22 16:40:33 +01:00
committed by Greg Turnquist
parent cba67914d2
commit dcc8b8deb0
4 changed files with 21 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-ws-security/src/test/java/org/springframework/ws/soap/security/wss4j2/Wss4jTestCase.java
View File

@@ -23,12 +23,10 @@ import javax.xml.soap.MessageFactory;
import javax.xml.soap.MimeHeaders;
import javax.xml.soap.SOAPConstants;
import javax.xml.soap.SOAPMessage;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
import javax.xml.transform.dom.DOMSource;
import org.apache.axiom.soap.SOAP12Constants;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.soap.SOAPModelBuilder;
import org.junit.Assert;
import org.junit.Before;
import org.w3c.dom.Document;
@@ -154,9 +152,8 @@ public abstract class Wss4jTestCase {
assertTrue("Could not load Axiom message [" + resource + "]", resource.exists());
is = resource.getInputStream();
XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(is);
StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(parser, null);
org.apache.axiom.soap.SOAPMessage soapMessage = builder.getSoapMessage();
SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(is, null);
org.apache.axiom.soap.SOAPMessage soapMessage = builder.getSOAPMessage();
return new AxiomSoapMessage(soapMessage, "", true, true);
}
finally {
@@ -172,9 +169,8 @@ public abstract class Wss4jTestCase {
assertTrue("Could not load Axiom message [" + resource + "]", resource.exists());
is = resource.getInputStream();
XMLStreamReader parser = XMLInputFactory.newInstance().createXMLStreamReader(is);
StAXSOAPModelBuilder builder = new StAXSOAPModelBuilder(parser, SOAP12Constants.SOAP_ENVELOPE_NAMESPACE_URI);
org.apache.axiom.soap.SOAPMessage soapMessage = builder.getSoapMessage();
SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(is, null);
org.apache.axiom.soap.SOAPMessage soapMessage = builder.getSOAPMessage();
return new AxiomSoapMessage(soapMessage, "", true, true);
}
finally {