Author: veithen
Date: Mon May 2 08:46:05 2016
New Revision: 1741935
URL: http://svn.apache.org/viewvc?rev=1741935&view=rev
Log:
Eliminate usages of deprecated Axiom APIs.
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/SourceDataSource.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/XMLStringDataSource.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDataSource.java
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/SourceDataSource.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/SourceDataSource.java?rev=1741935&r1=1741934&r2=1741935&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/SourceDataSource.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/SourceDataSource.java
Mon May 2 08:46:05 2016
@@ -19,10 +19,8 @@
package org.apache.axis2.datasource;
-
-import org.apache.axiom.om.OMDataSourceExt;
import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.ds.OMDataSourceExtBase;
+import org.apache.axiom.om.ds.AbstractPullOMDataSource;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -44,22 +42,15 @@ import java.io.UnsupportedEncodingExcept
/**
* OMDataSource backed by a source
*/
-public class SourceDataSource extends OMDataSourceExtBase {
+public class SourceDataSource extends AbstractPullOMDataSource {
private static final Log log = LogFactory.getLog(SourceDataSource.class);
- Source data;
+
+ private final Source data;
public SourceDataSource(Source data) {
- super();
this.data = data;
}
- public void close() {
- }
-
- public OMDataSourceExt copy() {
- return null;
- }
-
public Source getObject() {
return data;
}
@@ -68,14 +59,14 @@ public class SourceDataSource extends OM
try {
String encoding = "utf-8";
- InputStream is = new ByteArrayInputStream(getXMLBytes(encoding));
+ InputStream is = new ByteArrayInputStream(getContent(encoding));
return StAXUtils.createXMLStreamReader(is, encoding);
} catch (UnsupportedEncodingException e) {
throw new XMLStreamException(e);
}
}
- public byte[] getXMLBytes(String encoding) throws
UnsupportedEncodingException {
+ private byte[] getContent(String encoding) throws
UnsupportedEncodingException {
if (log.isDebugEnabled()) {
log.debug("Start getXMLBytes");
}
@@ -113,10 +104,6 @@ public class SourceDataSource extends OM
return false;
}
- public boolean isDestructiveWrite() {
- return false;
- }
-
private static byte[] getBytesFromStream(InputStream is) throws
IOException {
// TODO This code assumes that available is the length of the stream.
byte[] bytes = new byte[is.available()];
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/XMLStringDataSource.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/XMLStringDataSource.java?rev=1741935&r1=1741934&r2=1741935&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/XMLStringDataSource.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/XMLStringDataSource.java
Mon May 2 08:46:05 2016
@@ -21,29 +21,23 @@ package org.apache.axis2.datasource;
import org.apache.axiom.om.OMDataSourceExt;
-import org.apache.axiom.om.ds.OMDataSourceExtBase;
+import org.apache.axiom.om.ds.AbstractPullOMDataSource;
import org.apache.axiom.om.util.StAXUtils;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
+import java.io.StringReader;
/**
* OMDataSource backed by a string containing xml data
*/
-public class XMLStringDataSource extends OMDataSourceExtBase {
- String data;
+public class XMLStringDataSource extends AbstractPullOMDataSource {
+ private final String data;
public XMLStringDataSource(String data) {
- super();
this.data = data;
}
- public void close() {
- }
-
public OMDataSourceExt copy() {
return new XMLStringDataSource(data);
}
@@ -53,26 +47,10 @@ public class XMLStringDataSource extends
}
public XMLStreamReader getReader() throws XMLStreamException {
-
- try {
- String encoding = "utf-8";
- InputStream is = new ByteArrayInputStream(getXMLBytes(encoding));
- return StAXUtils.createXMLStreamReader(is, encoding);
- } catch (UnsupportedEncodingException e) {
- throw new XMLStreamException(e);
- }
- }
-
- public byte[] getXMLBytes(String encoding) throws
UnsupportedEncodingException {
- return data.getBytes(encoding);
+ return StAXUtils.createXMLStreamReader(new StringReader(data));
}
public boolean isDestructiveRead() {
return false;
}
-
- public boolean isDestructiveWrite() {
- return false;
- }
-
}
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDataSource.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDataSource.java?rev=1741935&r1=1741934&r2=1741935&view=diff
==============================================================================
---
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDataSource.java
(original)
+++
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBDataSource.java
Mon May 2 08:46:05 2016
@@ -21,45 +21,29 @@ package org.apache.axis2.datasource.jaxb
import org.apache.axiom.om.OMDataSourceExt;
-import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMOutputFormat;
-import org.apache.axiom.om.ds.OMDataSourceExtBase;
-import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
-import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axis2.jaxws.message.util.XMLStreamWriterWithOS;
+import org.apache.axiom.om.ds.AbstractPushOMDataSource;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import javax.xml.bind.JAXBException;
import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
/**
* OMDataSource backed by a jaxb object
*/
-public class JAXBDataSource extends OMDataSourceExtBase {
+public class JAXBDataSource extends AbstractPushOMDataSource {
private static final Log log = LogFactory.getLog(JAXBDataSource.class);
- Object jaxb;
- JAXBDSContext context;
+ private final Object jaxb;
+ private final JAXBDSContext context;
public JAXBDataSource(Object jaxb, JAXBDSContext context) {
- super();
this.jaxb = jaxb;
this.context = context;
}
- public void close() {
- }
-
public OMDataSourceExt copy() {
return new JAXBDataSource(jaxb, context);
}
@@ -72,42 +56,6 @@ public class JAXBDataSource extends OMDa
return context;
}
- public XMLStreamReader getReader() throws XMLStreamException {
-
- try {
- String encoding = "utf-8";
- InputStream is = new ByteArrayInputStream(getXMLBytes(encoding));
- return StAXUtils.createXMLStreamReader(is, encoding);
- } catch (UnsupportedEncodingException e) {
- throw new XMLStreamException(e);
- }
- }
-
- public void serialize(OutputStream output, OMOutputFormat format) throws
XMLStreamException {
- MTOMXMLStreamWriter writer = new MTOMXMLStreamWriter(output, format);
- serialize(writer);
- writer.flush();
- try {
- writer.close();
- } catch (XMLStreamException e) {
- // An exception can occur if nothing is written to the
- // writer. This is possible if the underlying data source
- // writers to the output stream directly.
- if (log.isDebugEnabled()) {
- log.debug("Catching and swallowing exception " + e);
- }
- }
- }
-
- public void serialize(Writer writerTarget, OMOutputFormat format) throws
XMLStreamException {
- MTOMXMLStreamWriter writer =
- new
MTOMXMLStreamWriter(StAXUtils.createXMLStreamWriter(writerTarget));
- writer.setOutputFormat(format);
- serialize(writer);
- writer.flush();
- writer.close();
- }
-
public void serialize(XMLStreamWriter xmlWriter) throws XMLStreamException
{
try {
context.marshal(jaxb, xmlWriter);
@@ -122,32 +70,8 @@ public class JAXBDataSource extends OMDa
throw new XMLStreamException(je);
}
}
-
- public byte[] getXMLBytes(String encoding) throws
UnsupportedEncodingException {
- try {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
-
- // Exposes getOutputStream, which allows faster writes.
- XMLStreamWriterWithOS writer = new XMLStreamWriterWithOS(baos,
encoding);
-
- // Write the business object to the writer
- serialize(writer);
-
- // Flush the writer
- writer.flush();
- writer.close();
- return baos.toByteArray();
- } catch (XMLStreamException e) {
- throw new OMException(e);
- }
- }
-
- public boolean isDestructiveRead() {
- return false;
- }
public boolean isDestructiveWrite() {
return false;
}
-
}
