This is an automated email from the ASF dual-hosted git repository.

veithen pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-core.git


The following commit(s) were added to refs/heads/master by this push:
     new cad84624a6 Adapt to changes in the Axiom API
cad84624a6 is described below

commit cad84624a65ece61b8775ce68b99187f2f12006e
Author: Andreas Veithen <andreas.veit...@gmail.com>
AuthorDate: Sun Nov 6 15:21:02 2022 +0000

    Adapt to changes in the Axiom API
---
 .../org/apache/axis2/jaxbri/mtom/MtomImpl.java     |  2 +-
 .../databinding/typemapping/SimpleTypeMapper.java  |  3 ++-
 .../axis2/databinding/utils/BeanUtilTest.java      |  3 ++-
 .../org/apache/axis2/mtom/EchoRawMTOMTest.java     |  8 ++++----
 .../mtom/MessageSaveAndRestoreWithMTOMTest.java    |  6 ++++--
 .../jaxb/JAXBAttachmentUnmarshaller.java           |  5 ++++-
 .../axis2/jaxws/utility/DataSourceFormatter.java   |  5 +++--
 .../jaxws/message/MessagePersistanceTests.java     |  7 ++++---
 .../axis2/kernel/http/SOAPMessageFormatter.java    |  3 ++-
 .../org/apache/axis2/saaj/SOAPConnectionImpl.java  |  3 ++-
 .../src/org/apache/axis2/saaj/SOAPMessageImpl.java |  3 ++-
 .../src/org/apache/axis2/saaj/util/SAAJUtil.java   |  6 ++++--
 .../org/apache/axis2/format/BinaryFormatter.java   | 24 ++++++++++------------
 .../org/apache/axis2/transport/jms/JMSSender.java  |  8 ++++----
 .../transport/testkit/message/MessageDecoder.java  |  4 +---
 .../transport/testkit/message/MessageEncoder.java  |  2 +-
 16 files changed, 51 insertions(+), 41 deletions(-)

diff --git 
a/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomImpl.java
 
b/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomImpl.java
index ed3ef9a811..7c60c19ed3 100644
--- 
a/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomImpl.java
+++ 
b/databinding-tests/jaxbri-tests/src/test/java/org/apache/axis2/jaxbri/mtom/MtomImpl.java
@@ -26,7 +26,7 @@ import java.util.UUID;
 import javax.activation.DataHandler;
 
 import org.apache.axiom.blob.Blob;
-import org.apache.axiom.mime.PartDataHandler;
+import org.apache.axiom.mime.activation.PartDataHandler;
 import org.apache.axiom.util.activation.BlobDataSource;
 
 public class MtomImpl implements MtomSkeletonInterface {
diff --git 
a/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
 
b/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
index a10858bcbb..0a503792c0 100644
--- 
a/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
+++ 
b/modules/adb/src/org/apache/axis2/databinding/typemapping/SimpleTypeMapper.java
@@ -23,6 +23,7 @@ import org.apache.axiom.attachments.ByteArrayDataSource;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.OMText;
+import org.apache.axiom.util.activation.DataHandlerUtils;
 import org.apache.axiom.util.base64.Base64Utils;
 import org.apache.axis2.databinding.types.HexBinary;
 import org.apache.axis2.databinding.utils.ConverterUtil;
@@ -199,7 +200,7 @@ public class SimpleTypeMapper {
         if (node instanceof OMText) {
             OMText txt = (OMText)node;
             if (txt.isOptimized()) {
-                return (DataHandler)txt.getDataHandler();
+                return DataHandlerUtils.getDataHandler(txt.getBlob());
             } else {
                 return new DataHandler(new 
ByteArrayDataSource(Base64Utils.decode(txt.getText())));
             }
diff --git 
a/modules/adb/test/org/apache/axis2/databinding/utils/BeanUtilTest.java 
b/modules/adb/test/org/apache/axis2/databinding/utils/BeanUtilTest.java
index 88cf5073aa..e5c202889e 100644
--- a/modules/adb/test/org/apache/axis2/databinding/utils/BeanUtilTest.java
+++ b/modules/adb/test/org/apache/axis2/databinding/utils/BeanUtilTest.java
@@ -21,6 +21,7 @@ package org.apache.axis2.databinding.utils;
 
 import org.apache.axiom.om.*;
 import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.util.activation.DataHandlerUtils;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.AxisService;
@@ -164,7 +165,7 @@ public class BeanUtilTest extends TestCase {
                 new Object[] { dh }, new QName("urn:ns1", "part"), true, new 
TypeTable());
         OMText text = (OMText)element.getFirstElement().getFirstOMChild();
         assertTrue(text.isOptimized());
-        assertSame(dh, text.getDataHandler());
+        assertSame(dh, DataHandlerUtils.toDataHandler(text.getBlob()));
     }
 
     public void testProcessObjectWithWrongType() throws Exception {
diff --git 
a/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java 
b/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
index 8deab9dffe..7218e942a0 100644
--- a/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
+++ b/modules/integration/test/org/apache/axis2/mtom/EchoRawMTOMTest.java
@@ -22,6 +22,8 @@ package org.apache.axis2.mtom;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+
+import org.apache.axiom.blob.Blob;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -188,10 +190,8 @@ public class EchoRawMTOMTest extends 
UtilServerBasedTestCase implements TestCons
         compareWithCreatedOMText(binaryNode);
 
         // Save the image
-        DataHandler actualDH;
-        actualDH = (DataHandler)binaryNode.getDataHandler();
-        ImageIO.read(actualDH.getDataSource()
-                .getInputStream());
+        Blob actualBlob = binaryNode.getBlob();
+        ImageIO.read(actualBlob.getInputStream());
     }
 
     public void testEchoXMLSyncSeperateListener() throws Exception {
diff --git 
a/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java
 
b/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java
index b16db2045a..1a99db59e5 100644
--- 
a/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java
+++ 
b/modules/integration/test/org/apache/axis2/mtom/MessageSaveAndRestoreWithMTOMTest.java
@@ -22,6 +22,8 @@ package org.apache.axis2.mtom;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+
+import org.apache.axiom.blob.Blob;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMFactory;
@@ -160,8 +162,8 @@ public class MessageSaveAndRestoreWithMTOMTest extends 
UtilServerBasedTestCase
 
         compareWithCreatedOMText(binaryNode);
 
-        DataHandler actualDH = (DataHandler)binaryNode.getDataHandler();
-        BufferedImage bi = 
ImageIO.read(actualDH.getDataSource().getInputStream());
+        Blob actualBlob = binaryNode.getBlob();
+        BufferedImage bi = ImageIO.read(actualBlob.getInputStream());
     }
 
     protected OMElement createEnvelope() throws Exception {
diff --git 
a/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
 
b/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
index a188cf02ca..efdab6099a 100644
--- 
a/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
+++ 
b/modules/jaxws/src/org/apache/axis2/datasource/jaxb/JAXBAttachmentUnmarshaller.java
@@ -19,8 +19,10 @@
 
 package org.apache.axis2.datasource.jaxb;
 
+import org.apache.axiom.blob.Blob;
 import org.apache.axiom.om.OMAttachmentAccessor;
 import org.apache.axiom.om.OMException;
+import org.apache.axiom.util.activation.DataHandlerUtils;
 import org.apache.axis2.jaxws.i18n.Messages;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -157,7 +159,8 @@ public final class JAXBAttachmentUnmarshaller extends 
AttachmentUnmarshaller {
         if (blobcid.startsWith("cid:")) {
             blobcid = blobcid.substring(4);
         }
-        DataHandler dh = attachmentAccessor.getDataHandler(blobcid);
+        Blob blob = attachmentAccessor.getBlob(blobcid);
+        DataHandler dh = blob == null ? null : 
DataHandlerUtils.toDataHandler(blob);
         if (dh == null) {
             dh = context.getDataHandlerForSwA(blobcid);
         }
diff --git 
a/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java 
b/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java
index 3efa326766..a632beeb85 100644
--- a/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java
+++ b/modules/jaxws/src/org/apache/axis2/jaxws/utility/DataSourceFormatter.java
@@ -23,6 +23,7 @@ import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axiom.om.OMSourcedElement;
 import org.apache.axiom.om.impl.OMMultipartWriter;
+import org.apache.axiom.util.activation.DataHandlerUtils;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.jaxws.handler.AttachmentsAdapter;
 import org.apache.axis2.jaxws.message.databinding.DataSourceBlock;
@@ -69,9 +70,9 @@ public class DataSourceFormatter implements MessageFormatter {
                     dataHandler = new WrappedDataHandler(dataHandler, 
contentType);
                 }
                 try {
-                    mpw.writePart(dataHandler, format.getRootContentId());
+                    mpw.writePart(DataHandlerUtils.toBlob(dataHandler), 
format.getRootContentId());
                     for (String cid : attachments.keySet()) {
-                        mpw.writePart(attachments.get(cid), cid);
+                        
mpw.writePart(DataHandlerUtils.toBlob(attachments.get(cid)), cid);
                     }
                     mpw.complete();
                     outputStream.flush();
diff --git 
a/modules/jaxws/test/org/apache/axis2/jaxws/message/MessagePersistanceTests.java
 
b/modules/jaxws/test/org/apache/axis2/jaxws/message/MessagePersistanceTests.java
index ee6593d155..f58e0ab64e 100644
--- 
a/modules/jaxws/test/org/apache/axis2/jaxws/message/MessagePersistanceTests.java
+++ 
b/modules/jaxws/test/org/apache/axis2/jaxws/message/MessagePersistanceTests.java
@@ -21,6 +21,7 @@ package org.apache.axis2.jaxws.message;
 
 import junit.framework.TestCase;
 
+import org.apache.axiom.blob.Blob;
 import org.apache.axiom.om.OMDataSource;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMNode;
@@ -515,19 +516,19 @@ public class MessagePersistanceTests extends TestCase {
         env = restoredMC.getEnvelope();
         env.build();
         
-        DataHandler dh = null;
+        Blob blob = null;
         for (Iterator<OMNode> it = env.getDescendants(false); it.hasNext(); ) {
             OMNode node = it.next();
             if (node instanceof OMText) {
                 OMText text = (OMText)node;
                 if (text.isBinary()) {
-                    dh = text.getDataHandler();
+                    blob = text.getBlob();
                     break;
                 }
             }
         }
         
-        assertTrue(dh != null);       
+        assertTrue(blob != null);       
     }
     
     /**
diff --git 
a/modules/kernel/src/org/apache/axis2/kernel/http/SOAPMessageFormatter.java 
b/modules/kernel/src/org/apache/axis2/kernel/http/SOAPMessageFormatter.java
index 49fe3cb9ad..5d0215bbe4 100644
--- a/modules/kernel/src/org/apache/axis2/kernel/http/SOAPMessageFormatter.java
+++ b/modules/kernel/src/org/apache/axis2/kernel/http/SOAPMessageFormatter.java
@@ -30,6 +30,7 @@ import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPMessage;
 import org.apache.axiom.util.UIDGenerator;
+import org.apache.axiom.util.activation.DataHandlerUtils;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.context.MessageContext;
@@ -214,7 +215,7 @@ public class SOAPMessageFormatter implements 
MessageFormatter {
             
             Attachments attachments = msgCtxt.getAttachmentMap();
             for (String contentID : attachments.getAllContentIDs()) {
-                
attachmentsWriter.writePart(attachments.getDataHandler(contentID), contentID);
+                
attachmentsWriter.writePart(DataHandlerUtils.toBlob(attachments.getDataHandler(contentID)),
 contentID);
             }
             
             if (MM7CompatMode) {
diff --git a/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java 
b/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
index fe5609c7f8..f8c91a7483 100644
--- a/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
+++ b/modules/saaj/src/org/apache/axis2/saaj/SOAPConnectionImpl.java
@@ -26,6 +26,7 @@ import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.OMText;
 import org.apache.axiom.om.impl.MTOMConstants;
+import org.apache.axiom.util.activation.DataHandlerUtils;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
 import org.apache.axis2.addressing.EndpointReference;
@@ -362,7 +363,7 @@ public class SOAPConnectionImpl extends SOAPConnection {
 
                     final OMText omText = (OMText)omChildNode;
                     if (omText.isOptimized()) { // is this an attachment?
-                        final DataHandler datahandler = 
(DataHandler)omText.getDataHandler();
+                        final DataHandler datahandler = 
DataHandlerUtils.toDataHandler(omText.getBlob());
                         AttachmentPart attachment = 
saajSOAPMsg.createAttachmentPart(datahandler);
                         final String id = IDGenerator.generateID();
                         attachment.setContentId("<" + id + ">");
diff --git a/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java 
b/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
index 6d252a300d..397969c062 100644
--- a/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
+++ b/modules/saaj/src/org/apache/axis2/saaj/SOAPMessageImpl.java
@@ -29,6 +29,7 @@ import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFactory;
 import org.apache.axiom.soap.SOAPVersion;
 import org.apache.axiom.util.UIDGenerator;
+import org.apache.axiom.util.activation.DataHandlerUtils;
 import org.apache.axis2.saaj.util.SAAJUtil;
 import org.apache.axis2.kernel.http.HTTPConstants;
 
@@ -403,7 +404,7 @@ public class SOAPMessageImpl extends SOAPMessage {
                 envelope.serialize(rootPartOutputStream);
                 rootPartOutputStream.close();
                 for (AttachmentPart ap : attachmentParts) {
-                    mpw.writePart(ap.getDataHandler(), ap.getContentId());
+                    
mpw.writePart(DataHandlerUtils.toBlob(ap.getDataHandler()), ap.getContentId());
                 }
                 mpw.complete();
             }
diff --git a/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java 
b/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
index 24a8793f0f..c9ab8dd0d8 100644
--- a/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
+++ b/modules/saaj/src/org/apache/axis2/saaj/util/SAAJUtil.java
@@ -19,10 +19,12 @@
 
 package org.apache.axis2.saaj.util;
 
+import org.apache.axiom.blob.Blob;
 import org.apache.axiom.om.OMAbstractFactory;
 import org.apache.axiom.om.OMAttachmentAccessor;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.util.activation.DataHandlerUtils;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 
@@ -106,8 +108,8 @@ public class SAAJUtil {
         OMElement docElem = 
(OMElement)message.getSOAPPart().getDocumentElement();
         OMAttachmentAccessor attachmentAccessor = new OMAttachmentAccessor() {
             @Override
-            public DataHandler getDataHandler(String contentID) {
-                return attachments.get(contentID);
+            public Blob getBlob(String contentID) {
+                return DataHandlerUtils.toBlob(attachments.get(contentID));
             }
         };
         return 
OMXMLBuilderFactory.createSOAPModelBuilder(OMAbstractFactory.getMetaFactory(),
diff --git 
a/modules/transport/base/src/main/java/org/apache/axis2/format/BinaryFormatter.java
 
b/modules/transport/base/src/main/java/org/apache/axis2/format/BinaryFormatter.java
index d21b7755af..ae59ff6622 100644
--- 
a/modules/transport/base/src/main/java/org/apache/axis2/format/BinaryFormatter.java
+++ 
b/modules/transport/base/src/main/java/org/apache/axis2/format/BinaryFormatter.java
@@ -22,28 +22,26 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.net.URL;
 
-import javax.activation.DataHandler;
 import javax.activation.DataSource;
 
+import org.apache.axiom.blob.Blob;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMNode;
 import org.apache.axiom.om.OMOutputFormat;
 import org.apache.axiom.om.OMText;
+import org.apache.axiom.util.activation.DataHandlerUtils;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.kernel.http.util.URLTemplatingUtil;
 import org.apache.axis2.transport.base.BaseConstants;
 
 public class BinaryFormatter implements MessageFormatterEx {
-    private DataHandler getDataHandler(MessageContext messageContext) {
+    private Blob getBlob(MessageContext messageContext) {
         OMElement firstChild = 
messageContext.getEnvelope().getBody().getFirstElement();
         if 
(BaseConstants.DEFAULT_BINARY_WRAPPER.equals(firstChild.getQName())) {
             OMNode omNode = firstChild.getFirstOMChild();
             if (omNode != null && omNode instanceof OMText) {
-                Object dh = ((OMText)omNode).getDataHandler();
-                if (dh != null && dh instanceof DataHandler) {
-                    return (DataHandler)dh;
-                }
+                return ((OMText)omNode).getBlob();
             }
         }
         return null;
@@ -51,10 +49,10 @@ public class BinaryFormatter implements MessageFormatterEx {
     
     public void writeTo(MessageContext messageContext, OMOutputFormat format,
             OutputStream outputStream, boolean preserve) throws AxisFault {
-        DataHandler dh = getDataHandler(messageContext);
-        if (dh != null) {
+        Blob blob = getBlob(messageContext);
+        if (blob != null) {
             try {
-                dh.writeTo(outputStream);
+                blob.writeTo(outputStream);
             } catch (IOException e) {
                 throw new AxisFault("Error serializing binary content of 
element : " +
                                 BaseConstants.DEFAULT_BINARY_WRAPPER, e);
@@ -64,9 +62,9 @@ public class BinaryFormatter implements MessageFormatterEx {
 
     public String getContentType(MessageContext messageContext,
             OMOutputFormat format, String soapAction) {
-        DataHandler dh = getDataHandler(messageContext);
-        if (dh != null) {
-            return dh.getContentType();
+        Blob blob = getBlob(messageContext);
+        if (blob != null) {
+            return DataHandlerUtils.toDataHandler(blob).getContentType();
         } else {
             return null;
         }
@@ -84,6 +82,6 @@ public class BinaryFormatter implements MessageFormatterEx {
 
     public DataSource getDataSource(MessageContext messageContext,
             OMOutputFormat format, String soapAction) throws AxisFault {
-        return getDataHandler(messageContext).getDataSource();
+        return 
DataHandlerUtils.toDataHandler(getBlob(messageContext)).getDataSource();
     }
 }
diff --git 
a/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
 
b/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
index 774e44dc4f..2833b50136 100644
--- 
a/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
+++ 
b/modules/transport/jms/src/main/java/org/apache/axis2/transport/jms/JMSSender.java
@@ -16,6 +16,7 @@
 package org.apache.axis2.transport.jms;
 
 import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.blob.Blob;
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.om.OMText;
 import org.apache.axiom.om.OMNode;
@@ -33,7 +34,6 @@ import 
org.apache.axis2.transport.jms.iowrappers.BytesMessageOutputStream;
 import org.apache.commons.io.output.WriterOutputStream;
 
 import javax.jms.*;
-import javax.activation.DataHandler;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringWriter;
@@ -396,10 +396,10 @@ public class JMSSender extends AbstractTransportSender 
implements ManagementSupp
                 getFirstChildWithName(BaseConstants.DEFAULT_BINARY_WRAPPER);
             OMNode omNode = wrapper.getFirstOMChild();
             if (omNode != null && omNode instanceof OMText) {
-                Object dh = ((OMText) omNode).getDataHandler();
-                if (dh != null && dh instanceof DataHandler) {
+                Blob blob = ((OMText) omNode).getBlob();
+                if (blob != null) {
                     try {
-                        ((DataHandler) dh).writeTo(new 
BytesMessageOutputStream(bytesMsg));
+                        blob.writeTo(new BytesMessageOutputStream(bytesMsg));
                     } catch (IOException e) {
                         handleException("Error serializing binary content of 
element : " +
                             BaseConstants.DEFAULT_BINARY_WRAPPER, e);
diff --git 
a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageDecoder.java
 
b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageDecoder.java
index 167e78a739..3dbf1f51a4 100644
--- 
a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageDecoder.java
+++ 
b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageDecoder.java
@@ -26,8 +26,6 @@ import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 
-import javax.activation.DataHandler;
-
 import junit.framework.Assert;
 
 import org.apache.axiom.attachments.Attachments;
@@ -51,7 +49,7 @@ public interface MessageDecoder<T,U> {
             OMNode child = wrapper.getFirstOMChild();
             Assert.assertTrue(child instanceof OMText);
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            ((DataHandler)((OMText)child).getDataHandler()).writeTo(baos);
+            ((OMText)child).getBlob().writeTo(baos);
             return baos.toByteArray();
         }
     };
diff --git 
a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java
 
b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java
index ea103ff9b1..63f79603ef 100644
--- 
a/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java
+++ 
b/modules/transport/testkit/src/main/java/org/apache/axis2/transport/testkit/message/MessageEncoder.java
@@ -94,7 +94,7 @@ public interface MessageEncoder<T,U> {
                 out.close();
                 Attachments attachments = message.getAttachments();
                 for (String id : attachments.getAllContentIDs()) {
-                    mpw.writePart(attachments.getDataHandler(id), id);
+                    mpw.writePart(attachments.getBlob(id), id);
                 }
                 mpw.complete();
             } else {

Reply via email to