svn commit: r1719748 - in /axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/format: PlainTextFormatter.java TextFromElementDataSource.java

[ve...@apache.org]

Author: veithen
Date: Sat Dec 12 22:39:48 2015
New Revision: 1719748

URL: http://svn.apache.org/viewvc?rev=1719748&view=rev
Log:
Eliminate usages of deprecated Axiom APIs.

Modified:
    axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java
    axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java

Modified: axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java?rev=1719748&r1=1719747&r2=1719748&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/format/PlainTextFormatter.java Sat Dec 12 22:39:48 2015
@@ -24,7 +24,6 @@ import org.apache.axis2.context.MessageC
 import org.apache.axis2.AxisFault;
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.util.ElementHelper;
 import org.apache.axis2.transport.base.BaseConstants;
 
 import java.io.ByteArrayOutputStream;
@@ -35,7 +34,6 @@ import java.io.Writer;
 import java.net.URL;
 
 import javax.activation.DataSource;
-import javax.xml.stream.XMLStreamException;
 
 public class PlainTextFormatter implements MessageFormatterEx {
 
@@ -50,12 +48,10 @@ public class PlainTextFormatter implemen
         if (BaseConstants.DEFAULT_TEXT_WRAPPER.equals(textElt.getQName())) {
             try {
                 Writer out = new OutputStreamWriter(outputStream, format.getCharSetEncoding());
-                ElementHelper.writeTextTo(textElt, out, preserve);
+                textElt.writeTextTo(out, preserve);
                 out.flush();
             } catch (IOException e) {
                 throw new AxisFault("Error writing text message to stream", e);
-            } catch (XMLStreamException e) {
-                throw new AxisFault("Error extracting the text payload from the message", e);
             }
         }
     }

Modified: axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java?rev=1719748&r1=1719747&r2=1719748&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java (original)
+++ axis/axis2/java/core/trunk/modules/transport/base/src/main/java/org/apache/axis2/format/TextFromElementDataSource.java Sat Dec 12 22:39:48 2015
@@ -25,7 +25,6 @@ import java.io.OutputStream;
 import javax.activation.DataSource;
 
 import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.util.ElementHelper;
 import org.apache.commons.io.input.ReaderInputStream;
 
 /**
@@ -57,7 +56,7 @@ public class TextFromElementDataSource i
     }
 
     public InputStream getInputStream() throws IOException {
-        return new ReaderInputStream(ElementHelper.getTextAsStream(element, true), charset);
+        return new ReaderInputStream(element.getTextAsStream(true), charset);
     }
 
     public OutputStream getOutputStream() throws IOException {