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 2016/05/05 11:26:21 UTC
svn commit: r1742412 - in
/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message:
databinding/impl/ impl/
Author: veithen
Date: Thu May 5 11:26:21 2016
New Revision: 1742412
URL: http://svn.apache.org/viewvc?rev=1742412&view=rev
Log:
Make BlockImpl extend AbstractOMDataSource.
Modified:
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/DataSourceBlockImpl.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/JAXBBlockImpl.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/OMBlockImpl.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SOAPEnvelopeBlockImpl.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockImpl.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/XMLStringBlockImpl.java
axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockImpl.java
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/DataSourceBlockImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/DataSourceBlockImpl.java?rev=1742412&r1=1742411&r2=1742412&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/DataSourceBlockImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/DataSourceBlockImpl.java Thu May 5 11:26:21 2016
@@ -23,11 +23,9 @@ import org.apache.axiom.om.OMAbstractFac
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMSourcedElement;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axiom.soap.SOAP11Constants;
-import org.apache.axiom.util.io.IOUtils;
import org.apache.axis2.builder.DataSourceBuilder;
import org.apache.axis2.java.security.AccessController;
import org.apache.axis2.jaxws.ExceptionFactory;
@@ -36,7 +34,6 @@ import org.apache.axis2.jaxws.message.da
import org.apache.axis2.jaxws.message.factory.BlockFactory;
import org.apache.axis2.jaxws.message.impl.BlockImpl;
import org.apache.axis2.jaxws.message.util.Reader2Writer;
-import org.apache.axis2.jaxws.utility.ConvertUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -47,12 +44,8 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.ws.WebServiceException;
-import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
@@ -163,14 +156,6 @@ public class DataSourceBlockImpl extends
}
}
- public void serialize(OutputStream output, OMOutputFormat format) throws XMLStreamException {
- try {
- IOUtils.copy(((DataSource)busObject).getInputStream(), output, -1);
- } catch (IOException e) {
- throw new XMLStreamException(e);
- }
- }
-
@Override
protected void _outputFromBO(DataSource busObject, Void busContext, XMLStreamWriter writer)
throws XMLStreamException, WebServiceException {
@@ -236,16 +221,6 @@ public class DataSourceBlockImpl extends
return; // Nothing to close
}
- public InputStream getXMLInputStream(String encoding) throws UnsupportedEncodingException {
- try {
- byte[] bytes = (byte[])
- ConvertUtils.convert(getBusinessObject(false), byte[].class);
- return new ByteArrayInputStream(bytes);
- } catch (XMLStreamException e) {
- throw ExceptionFactory.makeWebServiceException(e);
- }
- }
-
public Object getObject() {
try {
return getBusinessObject(false);
@@ -261,22 +236,4 @@ public class DataSourceBlockImpl extends
public boolean isDestructiveWrite() {
return true;
}
-
-
- public byte[] getXMLBytes(String encoding) throws UnsupportedEncodingException {
- if (log.isDebugEnabled()) {
- log.debug("Start getXMLBytes");
- }
- byte[] bytes = null;
- try {
- bytes = (byte[])
- ConvertUtils.convert(getBusinessObject(false), byte[].class);
- } catch (XMLStreamException e) {
- throw ExceptionFactory.makeWebServiceException(e);
- }
- if (log.isDebugEnabled()) {
- log.debug("End getXMLBytes");
- }
- return bytes;
- }
}
\ No newline at end of file
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/JAXBBlockImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/JAXBBlockImpl.java?rev=1742412&r1=1742411&r2=1742412&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/JAXBBlockImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/JAXBBlockImpl.java Thu May 5 11:26:21 2016
@@ -45,8 +45,6 @@ import javax.xml.stream.XMLStreamWriter;
import javax.xml.ws.WebServiceException;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
/**
* JAXBBlockImpl <p/> A Block containing a JAXB business object (either a JAXBElement or an object
@@ -195,18 +193,6 @@ public class JAXBBlockImpl extends Block
return; // Nothing to close
}
- public InputStream getXMLInputStream(String encoding) throws UnsupportedEncodingException {
- try {
- byte[] bytes= _getBytesFromBO(
- getBusinessObject(false),
- busContext,
- encoding);
- return new ByteArrayInputStream(bytes);
- } catch (XMLStreamException e) {
- throw ExceptionFactory.makeWebServiceException(e);
- }
- }
-
public Object getObject() {
try {
return getBusinessObject(false);
@@ -232,16 +218,6 @@ public class JAXBBlockImpl extends Block
(JAXBDSContext) this.getBusinessContext());
}
- public byte[] getXMLBytes(String encoding) throws UnsupportedEncodingException {
- try {
- return _getBytesFromBO(getBusinessObject(false),
- busContext,
- encoding);
- } catch (XMLStreamException e) {
- throw ExceptionFactory.makeWebServiceException(e);
- }
- }
-
public void setParent(Message message) {
if (busContext != null) {
((JAXBBlockContext) busContext).setMessage(message);
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/OMBlockImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/OMBlockImpl.java?rev=1742412&r1=1742411&r2=1742412&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/OMBlockImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/OMBlockImpl.java Thu May 5 11:26:21 2016
@@ -20,7 +20,6 @@
package org.apache.axis2.jaxws.message.databinding.impl;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMOutputFormat;
import org.apache.axis2.jaxws.ExceptionFactory;
import org.apache.axis2.jaxws.message.databinding.OMBlock;
import org.apache.axis2.jaxws.message.factory.BlockFactory;
@@ -30,11 +29,6 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.ws.WebServiceException;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
/** OMBlockImpl Block with a business object that is an OMElement */
public class OMBlockImpl extends BlockImpl<OMElement,Void> implements OMBlock {
@@ -92,11 +86,6 @@ public class OMBlockImpl extends BlockIm
return; // Nothing to close
}
- public InputStream getXMLInputStream(String encoding) throws UnsupportedEncodingException {
- byte[] bytes = getXMLBytes(encoding);
- return new ByteArrayInputStream(bytes);
- }
-
public Object getObject() {
try {
return getBusinessObject(false);
@@ -112,19 +101,4 @@ public class OMBlockImpl extends BlockIm
public boolean isDestructiveWrite() {
return false;
}
-
- public byte[] getXMLBytes(String encoding) throws UnsupportedEncodingException {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- OMOutputFormat format = new OMOutputFormat();
- format.setCharSetEncoding(encoding);
- try {
- serialize(baos, format);
- baos.flush();
- return baos.toByteArray();
- } catch (XMLStreamException e) {
- throw ExceptionFactory.makeWebServiceException(e);
- } catch (IOException e) {
- throw ExceptionFactory.makeWebServiceException(e);
- }
- }
}
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SOAPEnvelopeBlockImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SOAPEnvelopeBlockImpl.java?rev=1742412&r1=1742411&r2=1742412&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SOAPEnvelopeBlockImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SOAPEnvelopeBlockImpl.java Thu May 5 11:26:21 2016
@@ -23,7 +23,6 @@
package org.apache.axis2.jaxws.message.databinding.impl;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.OMOutputFormat;
import org.apache.axis2.jaxws.ExceptionFactory;
import org.apache.axis2.jaxws.message.Message;
import org.apache.axis2.jaxws.message.databinding.SOAPEnvelopeBlock;
@@ -34,17 +33,11 @@ import org.apache.axis2.jaxws.message.ut
import org.apache.axis2.jaxws.registry.FactoryRegistry;
import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPEnvelope;
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.ws.WebServiceException;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
/**
*
@@ -132,11 +125,6 @@ public class SOAPEnvelopeBlockImpl exten
return; // Nothing to close
}
- public InputStream getXMLInputStream(String encoding) throws UnsupportedEncodingException {
- byte[] bytes = getXMLBytes(encoding);
- return new ByteArrayInputStream(bytes);
- }
-
public Object getObject() {
try {
return getBusinessObject(false);
@@ -152,19 +140,4 @@ public class SOAPEnvelopeBlockImpl exten
public boolean isDestructiveWrite() {
return false;
}
-
- public byte[] getXMLBytes(String encoding) throws UnsupportedEncodingException {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- OMOutputFormat format = new OMOutputFormat();
- format.setCharSetEncoding(encoding);
- try {
- serialize(baos, format);
- baos.flush();
- return baos.toByteArray();
- } catch (XMLStreamException e) {
- throw ExceptionFactory.makeWebServiceException(e);
- } catch (IOException e) {
- throw ExceptionFactory.makeWebServiceException(e);
- }
- }
}
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockImpl.java?rev=1742412&r1=1742411&r2=1742412&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/SourceBlockImpl.java Thu May 5 11:26:21 2016
@@ -49,9 +49,7 @@ import javax.xml.transform.stream.Stream
import javax.xml.ws.WebServiceException;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
import java.security.PrivilegedActionException;
import java.security.PrivilegedExceptionAction;
@@ -326,16 +324,6 @@ public class SourceBlockImpl extends Blo
return; // Nothing to close
}
- public InputStream getXMLInputStream(String encoding) throws UnsupportedEncodingException {
- try {
- byte[] bytes = (byte[])
- ConvertUtils.convert(getBusinessObject(false), byte[].class);
- return new ByteArrayInputStream(bytes);
- } catch (XMLStreamException e) {
- throw ExceptionFactory.makeWebServiceException(e);
- }
- }
-
public Object getObject() {
try {
return getBusinessObject(false);
@@ -351,22 +339,4 @@ public class SourceBlockImpl extends Blo
public boolean isDestructiveWrite() {
return true;
}
-
-
- public byte[] getXMLBytes(String encoding) throws UnsupportedEncodingException {
- if (log.isDebugEnabled()) {
- log.debug("Start getXMLBytes");
- }
- byte[] bytes = null;
- try {
- bytes = (byte[])
- ConvertUtils.convert(getBusinessObject(false), byte[].class);
- } catch (XMLStreamException e) {
- throw ExceptionFactory.makeWebServiceException(e);
- }
- if (log.isDebugEnabled()) {
- log.debug("End getXMLBytes");
- }
- return bytes;
- }
}
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/XMLStringBlockImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/XMLStringBlockImpl.java?rev=1742412&r1=1742411&r2=1742412&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/XMLStringBlockImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/impl/XMLStringBlockImpl.java Thu May 5 11:26:21 2016
@@ -37,10 +37,7 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.ws.WebServiceException;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
/**
* XMLStringBlock
@@ -124,15 +121,6 @@ public class XMLStringBlockImpl extends
return; // Nothing to close
}
- public InputStream getXMLInputStream(String encoding) throws UnsupportedEncodingException {
- try {
- byte[] bytes = ((String) getBusinessObject(false)).getBytes(encoding);
- return new ByteArrayInputStream(bytes);
- } catch (XMLStreamException e) {
- throw ExceptionFactory.makeWebServiceException(e);
- }
- }
-
public Object getObject() {
try {
return getBusinessObject(false);
@@ -154,13 +142,4 @@ public class XMLStringBlockImpl extends
public OMDataSourceExt copy() throws OMException {
return new StringOMDataSource((String) getObject());
}
-
-
- public byte[] getXMLBytes(String encoding) throws UnsupportedEncodingException {
- try {
- return ((String) getBusinessObject(false)).getBytes(encoding);
- } catch (XMLStreamException e) {
- throw ExceptionFactory.makeWebServiceException(e);
- }
- }
}
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockImpl.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockImpl.java?rev=1742412&r1=1742411&r2=1742412&view=diff
==============================================================================
--- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockImpl.java (original)
+++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/impl/BlockImpl.java Thu May 5 11:26:21 2016
@@ -23,11 +23,10 @@ import org.apache.axiom.blob.Blobs;
import org.apache.axiom.om.OMDataSourceExt;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMException;
-import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.axiom.om.ds.AbstractOMDataSource;
import org.apache.axiom.om.ds.BlobOMDataSource;
-import org.apache.axiom.om.impl.MTOMXMLStreamWriter;
import org.apache.axiom.om.util.StAXUtils;
import org.apache.axis2.jaxws.ExceptionFactory;
import org.apache.axis2.jaxws.i18n.Messages;
@@ -45,11 +44,8 @@ import javax.xml.stream.XMLStreamExcepti
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.ws.WebServiceException;
-import java.io.OutputStream;
import java.io.StringReader;
import java.io.UnsupportedEncodingException;
-import java.io.Writer;
-import java.util.HashMap;
/**
* BlockImpl Abstract Base class for various Block Implementations.
@@ -64,7 +60,7 @@ import java.util.HashMap;
* The derived classes don't have direct access to the instance data. This ensures that BlockImpl
* controls the transformations.
*/
-public abstract class BlockImpl<T,C> implements Block<T,C> {
+public abstract class BlockImpl<T,C> extends AbstractOMDataSource implements Block<T,C> {
private static Log log = LogFactory.getLog(BlockImpl.class);
@@ -80,8 +76,6 @@ public abstract class BlockImpl<T,C> imp
protected boolean consumed = false;
protected Message parent;
- private HashMap<String,Object> map = null; // OMDataSourceExt properties
-
/**
* A Block has the following components
*
@@ -259,37 +253,6 @@ public abstract class BlockImpl<T,C> imp
}
/* (non-Javadoc)
- * @see org.apache.axiom.om.OMDataSource#serialize(java.io.OutputStream, org.apache.axiom.om.OMOutputFormat)
- */
- 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);
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.apache.axiom.om.OMDataSource#serialize(java.io.Writer, org.apache.axiom.om.OMOutputFormat)
- */
- public final void serialize(Writer writerTarget, OMOutputFormat format) throws XMLStreamException {
- MTOMXMLStreamWriter writer =
- new MTOMXMLStreamWriter(StAXUtils.createXMLStreamWriter(writerTarget));
- writer.setOutputFormat(format);
- serialize(writer);
- writer.flush();
- writer.close();
- }
-
- /* (non-Javadoc)
* @see org.apache.axiom.om.OMDataSource#serialize(javax.xml.stream.XMLStreamWriter)
*/
public final void serialize(XMLStreamWriter writer) throws XMLStreamException {
@@ -565,25 +528,4 @@ public abstract class BlockImpl<T,C> imp
protected abstract void _outputFromBO(T busObject, C busContext,
XMLStreamWriter writer)
throws XMLStreamException, WebServiceException;
-
- public final Object getProperty(String key) {
- if (map == null) {
- return null;
- }
- return map.get(key);
- }
-
- public final Object setProperty(String key, Object value) {
- if (map == null) {
- map = new HashMap<String,Object>();
- }
- return map.put(key, value);
- }
-
- public final boolean hasProperty(String key) {
- if (map == null) {
- return false;
- }
- return map.containsKey(key);
- }
}