You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/05/09 23:15:04 UTC
svn commit: r1336404 - in /axis/axis2/java/core/trunk: ./
modules/adb/src/org/apache/axis2/databinding/AbstractADBDataSource.java
modules/adb/src/org/apache/axis2/databinding/utils/writer/
modules/adb/test/org/apache/axis2/databinding/utils/writer/
Author: veithen
Date: Wed May 9 21:15:03 2012
New Revision: 1336404
URL: http://svn.apache.org/viewvc?rev=1336404&view=rev
Log:
Let ADB use the feature introduced by AXIOM-420.
Removed:
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/utils/writer/
axis/axis2/java/core/trunk/modules/adb/test/org/apache/axis2/databinding/utils/writer/
Modified:
axis/axis2/java/core/trunk/ (props changed)
axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/AbstractADBDataSource.java
Propchange: axis/axis2/java/core/trunk/
------------------------------------------------------------------------------
Merged /axis/axis2/java/core/branches/AXIOM-420:r1334386-1336397
Modified: axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/AbstractADBDataSource.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/AbstractADBDataSource.java?rev=1336404&r1=1336403&r2=1336404&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/AbstractADBDataSource.java (original)
+++ axis/axis2/java/core/trunk/modules/adb/src/org/apache/axis2/databinding/AbstractADBDataSource.java Wed May 9 21:15:03 2012
@@ -18,31 +18,14 @@
*/
package org.apache.axis2.databinding;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.util.HashMap;
-
import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-import org.apache.axiom.om.OMDataSource;
import org.apache.axiom.om.OMDataSourceExt;
-import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.QNameAwareOMDataSource;
-import org.apache.axiom.om.util.StAXUtils;
-import org.apache.axis2.databinding.utils.writer.MTOMAwareOMBuilder;
+import org.apache.axiom.om.ds.AbstractPushOMDataSource;
-public abstract class AbstractADBDataSource implements OMDataSourceExt, QNameAwareOMDataSource {
+public abstract class AbstractADBDataSource extends AbstractPushOMDataSource implements QNameAwareOMDataSource {
protected QName parentQName;
-
- HashMap map = null; // Map of properties
public AbstractADBDataSource(QName parentQName) {
this.parentQName = parentQName;
@@ -61,51 +44,6 @@ public abstract class AbstractADBDataSou
}
/**
- * @param output
- * @param format
- * @throws XMLStreamException
- * @see OMDataSource#serialize(java.io.OutputStream, org.apache.axiom.om.OMOutputFormat)
- */
- public void serialize(OutputStream output, OMOutputFormat format) throws XMLStreamException {
- XMLStreamWriter xmlStreamWriter = StAXUtils.createXMLStreamWriter(output);
- serialize(xmlStreamWriter);
- xmlStreamWriter.flush();
- }
-
- /**
- * @param writer
- * @param format
- * @throws XMLStreamException
- * @see OMDataSource#serialize(java.io.Writer, org.apache.axiom.om.OMOutputFormat)
- */
- public void serialize(Writer writer, OMOutputFormat format) throws XMLStreamException {
- XMLStreamWriter xmlStreamWriter = StAXUtils.createXMLStreamWriter(writer);
- serialize(xmlStreamWriter);
- xmlStreamWriter.flush();
- }
-
- /**
- * @throws XMLStreamException
- * @see org.apache.axiom.om.OMDataSource#getReader()
- */
- public XMLStreamReader getReader() throws XMLStreamException {
- MTOMAwareOMBuilder mtomAwareOMBuilder = new MTOMAwareOMBuilder();
- serialize(mtomAwareOMBuilder);
- return mtomAwareOMBuilder.getOMElement().getXMLStreamReader();
- }
-
- /**
- * Returns true if reading the backing object is destructive.
- * An example of an object with a destructive read is an InputSteam.
- * The owning OMSourcedElement uses this information to detemine if OM tree
- * expansion is needed when reading the OMDataSourceExt.
- * @return boolean
- */
- public boolean isDestructiveRead() {
- return false;
- }
-
- /**
* Returns true if writing the backing object is destructive.
* An example of an object with a destructive write is an InputStream.
* The owning OMSourcedElement uses this information to detemine if OM tree
@@ -116,55 +54,7 @@ public abstract class AbstractADBDataSou
return false;
}
- /**
- * Returns a InputStream representing the xml data
- * @param encoding String encoding of InputStream
- * @return InputStream
- */
- public InputStream getXMLInputStream(String encoding) throws UnsupportedEncodingException {
- return new ByteArrayInputStream(getXMLBytes(encoding));
- }
-
- /**
- * Returns a byte[] representing the xml data
- * @param encoding String encoding of InputStream
- * @return byte[]
- * @see getXMLInputStream
- */
- public byte[] getXMLBytes(String encoding) throws UnsupportedEncodingException {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- OMOutputFormat format = new OMOutputFormat();
- format.setCharSetEncoding(encoding);
- try {
- serialize(baos, format);
- } catch (XMLStreamException e) {
- new OMException(e);
- }
- return baos.toByteArray();
- }
-
public OMDataSourceExt copy() {
return null;
}
-
- public Object getProperty(String key) {
- if (map == null) {
- return null;
- }
- return map.get(key);
- }
-
- public Object setProperty(String key, Object value) {
- if (map == null) {
- map = new HashMap();
- }
- return map.put(key, value);
- }
-
- public boolean hasProperty(String key) {
- if (map == null) {
- return false;
- }
- return map.containsKey(key);
- }
}