You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2017/01/14 10:04:42 UTC
svn commit: r1778747 - in
/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse:
mediators/transform/FaultMediator.java util/TextFileDataSource.java
util/jaxp/DOOMResultBuilder.java
Author: veithen
Date: Sat Jan 14 10:04:42 2017
New Revision: 1778747
URL: http://svn.apache.org/viewvc?rev=1778747&view=rev
Log:
Eliminate some usages of deprecated Axiom APIs.
Modified:
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java
synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilder.java
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java?rev=1778747&r1=1778746&r2=1778747&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/mediators/transform/FaultMediator.java Sat Jan 14 10:04:42 2017
@@ -358,7 +358,7 @@ public class FaultMediator extends Abstr
private void setFaultNode(SOAPFactory factory, SOAPFault fault) {
if (faultNode != null) {
SOAPFaultNode soapfaultNode = factory.createSOAPFaultNode();
- soapfaultNode.setNodeValue(faultNode.toString());
+ soapfaultNode.setFaultNodeValue(faultNode.toString());
fault.setNode(soapfaultNode);
}
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java?rev=1778747&r1=1778746&r2=1778747&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/TextFileDataSource.java Sat Jan 14 10:04:42 2017
@@ -22,29 +22,21 @@ package org.apache.synapse.util;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMDataSourceExt;
import org.apache.axiom.om.OMFactory;
-import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMSourcedElement;
-import org.apache.axiom.om.ds.OMDataSourceExtBase;
-import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
-import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
-import org.apache.axiom.om.util.StAXUtils;
+import org.apache.axiom.om.ds.AbstractPullOMDataSource;
import org.apache.axiom.util.blob.OverflowBlob;
import org.apache.axiom.util.stax.WrappedTextNodeStreamReader;
import org.apache.axis2.transport.base.BaseConstants;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
import java.nio.charset.Charset;
-public class TextFileDataSource extends OMDataSourceExtBase {
+public class TextFileDataSource extends AbstractPullOMDataSource {
private final OverflowBlob overflowBlob;
private final Charset charset;
@@ -59,28 +51,6 @@ public class TextFileDataSource extends
return fac.createOMElement(txtFileDS, BaseConstants.DEFAULT_TEXT_WRAPPER);
}
- @Override
- public void serialize(OutputStream out, OMOutputFormat format) throws XMLStreamException {
- XMLStreamWriter writer = new MTOMXMLStreamWriter(out, format);
- serialize(writer);
- writer.flush();
- }
-
- @Override
- public void serialize(Writer writer, OMOutputFormat format) throws XMLStreamException {
- MTOMXMLStreamWriter xmlWriter =
- new MTOMXMLStreamWriter(StAXUtils.createXMLStreamWriter(writer));
- xmlWriter.setOutputFormat(format);
- serialize(xmlWriter);
- xmlWriter.flush();
- }
-
- @Override
- public void serialize(XMLStreamWriter xmlWriter) throws XMLStreamException {
- StreamingOMSerializer serializer = new StreamingOMSerializer();
- serializer.serialize(getReader(), xmlWriter);
- }
-
public XMLStreamReader getReader() throws XMLStreamException {
InputStream is;
try {
@@ -101,17 +71,6 @@ public class TextFileDataSource extends
return false;
}
- public boolean isDestructiveWrite() {
- return false;
- }
-
- public byte[] getXMLBytes(String encoding) throws UnsupportedEncodingException {
- throw new UnsupportedOperationException();
- }
-
- public void close() {
- }
-
public OMDataSourceExt copy() {
return new TextFileDataSource(overflowBlob, charset);
}
Modified: synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilder.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilder.java?rev=1778747&r1=1778746&r2=1778747&view=diff
==============================================================================
--- synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilder.java (original)
+++ synapse/trunk/java/modules/core/src/main/java/org/apache/synapse/util/jaxp/DOOMResultBuilder.java Sat Jan 14 10:04:42 2017
@@ -27,7 +27,7 @@ import javax.xml.transform.dom.DOMResult
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.dom.jaxp.DOOMDocumentBuilderFactory;
+import org.apache.axiom.om.dom.DOMMetaFactory;
import org.apache.axiom.om.util.ElementHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -45,8 +45,10 @@ public class DOOMResultBuilder implement
private Document document;
public Result getResult() {
+ DOMMetaFactory domMetaFactory
+ = ((DOMMetaFactory)OMAbstractFactory.getMetaFactory(OMAbstractFactory.FEATURE_DOM));
try {
- document = new DOOMDocumentBuilderFactory().newDocumentBuilder().newDocument();
+ document = domMetaFactory.newDocumentBuilderFactory().newDocumentBuilder().newDocument();
} catch (ParserConfigurationException e) {
handleException("Unable to create empty DOOM document", e);
}