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

Adapt deprecated code in Axiom 2

Browse Source 
This commit removes the compat module and adapt the deprecated code.

See gh-1454
This commit is contained in:
Stéphane Nicoll
2025-03-14 10:20:48 +01:00
parent 60942af529
commit 2c1abc64c3
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-ws-core/build.gradle
View File

@@ -26,9 +26,6 @@ dependencies {
optional("org.apache.ws.commons.axiom:axiom-impl") {
exclude(group: "commons-logging", module: "commons-logging")
}
optional("org.apache.ws.commons.axiom:axiom-compat") {
exclude(group: "commons-logging", module: "commons-logging")
}
optional("org.apache.ws.commons.axiom:axiom-legacy-attachments") {
exclude(group: "commons-logging", module: "commons-logging")
}

26
spring-ws-core/src/main/java/org/springframework/ws/soap/axiom/AxiomSoapMessageFactory.java
View File

@@ -29,6 +29,7 @@ import javax.xml.stream.XMLStreamReader;
import org.apache.axiom.attachments.Attachments;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMException;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.impl.MTOMConstants;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP11Version;
@@ -37,8 +38,6 @@ import org.apache.axiom.soap.SOAP12Version;
import org.apache.axiom.soap.SOAPFactory;
import org.apache.axiom.soap.SOAPMessage;
import org.apache.axiom.soap.SOAPModelBuilder;
import org.apache.axiom.soap.impl.builder.MTOMStAXSOAPModelBuilder;
import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -281,34 +280,33 @@ public class AxiomSoapMessageFactory implements SoapMessageFactory, Initializing
return contentType.contains(MULTI_PART_RELATED_CONTENT_TYPE);
}
@SuppressWarnings("deprecation")
/** Creates an AxiomSoapMessage without attachments. */
/**
* Creates an AxiomSoapMessage without attachments.
*/
private AxiomSoapMessage createAxiomSoapMessage(InputStream inputStream, String contentType, String soapAction)
throws XMLStreamException {
XMLStreamReader reader = this.inputFactory.createXMLStreamReader(inputStream, getCharSetEncoding(contentType));
String envelopeNamespace = getSoapEnvelopeNamespace(contentType);
SOAPModelBuilder builder = new StAXSOAPModelBuilder(reader, this.soapFactory, envelopeNamespace);
SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(inputStream,
getCharSetEncoding(contentType));
SOAPMessage soapMessage = builder.getSOAPMessage();
return new AxiomSoapMessage(soapMessage, soapAction, this.payloadCaching,
this.langAttributeOnSoap11FaultString);
}
@SuppressWarnings("deprecation")
/** Creates an AxiomSoapMessage with attachments. */
/**
* Creates an AxiomSoapMessage with attachments.
*/
private AxiomSoapMessage createMultiPartAxiomSoapMessage(InputStream inputStream, String contentType,
String soapAction) throws XMLStreamException {
Attachments attachments = new Attachments(inputStream, contentType, this.attachmentCaching,
this.attachmentCacheDir.getAbsolutePath(), Integer.toString(this.attachmentCacheThreshold));
XMLStreamReader reader = this.inputFactory.createXMLStreamReader(attachments.getRootPartInputStream(),
getCharSetEncoding(attachments.getRootPartContentType()));
String charSetEncoding = getCharSetEncoding(attachments.getRootPartContentType());
SOAPModelBuilder builder;
String envelopeNamespace = getSoapEnvelopeNamespace(contentType);
if (MTOMConstants.SWA_TYPE.equals(attachments.getAttachmentSpecType())
|| MTOMConstants.SWA_TYPE_12.equals(attachments.getAttachmentSpecType())) {
builder = new StAXSOAPModelBuilder(reader, this.soapFactory, envelopeNamespace);
builder = OMXMLBuilderFactory.createSOAPModelBuilder(attachments.getRootPartInputStream(), charSetEncoding);
}
else if (MTOMConstants.MTOM_TYPE.equals(attachments.getAttachmentSpecType())) {
builder = new MTOMStAXSOAPModelBuilder(reader, attachments, envelopeNamespace);
builder = OMXMLBuilderFactory.createSOAPModelBuilder(attachments.getMultipartBody());
}
else {
throw new AxiomSoapMessageCreationException(