You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/02/13 22:10:07 UTC

svn commit: r1730268 - in /webservices/axiom/trunk: aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/ aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/ axiom-api/src/main/java/org/apache/axiom/om/ axiom-ap...

Author: veithen
Date: Sat Feb 13 21:10:07 2016
New Revision: 1730268

URL: http://svn.apache.org/viewvc?rev=1730268&view=rev
Log:
AXIOM-445: Change return type of OMText#getDataHandler() to DataHandler instead of Object.

Modified:
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
    webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextSupport.aj
    webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMText.java
    webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java
    webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/MIMEOutputUtils.java
    webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/serialize/OMXMLReader.java
    webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/util/TextHelper.java
    webservices/axiom/trunk/axiom-jaxb/src/test/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSourceTest.java
    webservices/axiom/trunk/samples/src/test/java/org/apache/axiom/samples/MTOMSample.java
    webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md
    webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/attachments/ImageSampleTest.java
    webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestReadAttachmentBeforeRootPartComplete.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromDataHandlerProvider.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerProviderScenario.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerScenario.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/envelope/TestBuildWithAttachments.java
    webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestBuilderDetach.java

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/common/serializer/pull/Navigator.java Sat Feb 13 21:10:07 2016
@@ -810,7 +810,7 @@ final class Navigator extends PullSerial
 
     public DataHandler getDataHandler() throws XMLStreamException {
         if (node instanceof OMText) {
-            return (DataHandler)((OMText)node).getDataHandler();
+            return ((OMText)node).getDataHandler();
         } else {
             throw new IllegalStateException();
         }

Modified: webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextSupport.aj
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextSupport.aj?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextSupport.aj (original)
+++ webservices/axiom/trunk/aspects/om-aspects/src/main/java/org/apache/axiom/om/impl/mixin/AxiomTextSupport.aj Sat Feb 13 21:10:07 2016
@@ -133,7 +133,7 @@ public aspect AxiomTextSupport {
     public final void AxiomText.buildWithAttachments() {
         if (isOptimized()) {
             // The call to getDataSource ensures that the MIME part is completely read
-            ((DataHandler)this.getDataHandler()).getDataSource();
+            getDataHandler().getDataSource();
         }
     }
 

Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMText.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMText.java?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMText.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/OMText.java Sat Feb 13 21:10:07 2016
@@ -19,6 +19,7 @@
 
 package org.apache.axiom.om;
 
+import javax.activation.DataHandler;
 import javax.xml.namespace.QName;
 
 /**
@@ -83,7 +84,7 @@ public interface OMText extends OMNode {
      *
      * @return Returns datahandler.
      */
-    Object getDataHandler();
+    DataHandler getDataHandler();
 
     /** @return Returns boolean flag saying whether the node contains an optimized text or not. */
     // TODO: inconsistent naming

Modified: webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java (original)
+++ webservices/axiom/trunk/axiom-api/src/main/java/org/apache/axiom/om/impl/MTOMXMLStreamWriter.java Sat Feb 13 21:10:07 2016
@@ -391,7 +391,7 @@ public class MTOMXMLStreamWriter impleme
      */
     public void writeOptimized(OMText node) {
         log.debug("Start MTOMXMLStreamWriter.writeOptimized()");
-        otherParts.add(new Part(node.getContentID(), (DataHandler)node.getDataHandler()));    
+        otherParts.add(new Part(node.getContentID(), node.getDataHandler()));
         log.debug("Exit MTOMXMLStreamWriter.writeOptimized()");
     }
 
@@ -411,7 +411,7 @@ public class MTOMXMLStreamWriter impleme
         // The optimize argument is set to true for compatibility. Indeed, older versions
         // left it to the caller to check OMText#isOptimized().
         try {
-            return optimizationPolicy.isOptimized((DataHandler)node.getDataHandler(), true);
+            return optimizationPolicy.isOptimized(node.getDataHandler(), true);
         } catch (IOException ex) {
             return true;
         }

Modified: webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/MIMEOutputUtils.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/MIMEOutputUtils.java?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/MIMEOutputUtils.java (original)
+++ webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/MIMEOutputUtils.java Sat Feb 13 21:10:07 2016
@@ -107,9 +107,8 @@ public class MIMEOutputUtils {
             Iterator binaryNodeIterator = binaryNodeList.iterator();
             while (binaryNodeIterator.hasNext()) {
                 OMText binaryNode = (OMText) binaryNodeIterator.next();
-                writeBodyPart(outStream, createMimeBodyPart(binaryNode
-                        .getContentID(), (DataHandler) binaryNode
-                        .getDataHandler(), omOutputFormat), boundary);
+                writeBodyPart(outStream, createMimeBodyPart(binaryNode.getContentID(),
+                        binaryNode.getDataHandler(), omOutputFormat), boundary);
             }
             finishWritingMime(outStream);
             outStream.flush();

Modified: webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/serialize/OMXMLReader.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/serialize/OMXMLReader.java?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/serialize/OMXMLReader.java (original)
+++ webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/impl/serialize/OMXMLReader.java Sat Feb 13 21:10:07 2016
@@ -240,7 +240,7 @@ public class OMXMLReader extends Abstrac
     private void generateEvents(OMText omText, boolean space) throws SAXException {
         if (omText.isBinary()) {
             // Stream the binary content
-            DataHandler dh = (DataHandler)omText.getDataHandler();
+            DataHandler dh = omText.getDataHandler();
             Base64EncodingWriterOutputStream out = new Base64EncodingWriterOutputStream(new ContentHandlerWriter(contentHandler));
             try {
                 dh.writeTo(out);

Modified: webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/util/TextHelper.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/util/TextHelper.java?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/util/TextHelper.java (original)
+++ webservices/axiom/trunk/axiom-compat/src/main/java/org/apache/axiom/om/util/TextHelper.java Sat Feb 13 21:10:07 2016
@@ -109,9 +109,9 @@ public class TextHelper {
     public static void toStringBuffer(OMText omText, StringBuffer buffer) throws IOException {
         // If an InputStream is present, stream the BASE64 text to the StreamBuffer
         if (omText.isOptimized()) {
-           Object dh = omText.getDataHandler();
-           if (dh instanceof DataHandler) {
-               InputStream is = ((DataHandler) dh).getInputStream();
+           DataHandler dh = omText.getDataHandler();
+           if (dh != null) {
+               InputStream is = dh.getInputStream();
                if (is != null) {
                    toStringBuffer(is, buffer);
                    return;

Modified: webservices/axiom/trunk/axiom-jaxb/src/test/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSourceTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/axiom-jaxb/src/test/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSourceTest.java?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/axiom-jaxb/src/test/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSourceTest.java (original)
+++ webservices/axiom/trunk/axiom-jaxb/src/test/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSourceTest.java Sat Feb 13 21:10:07 2016
@@ -142,7 +142,7 @@ public class JAXBOMDataSourceTest {
         OMText content = (OMText)contentElement.getFirstOMChild();
         assertTrue(content.isBinary());
         assertTrue(content.isOptimized());
-        DataHandler dh = (DataHandler)content.getDataHandler();
+        DataHandler dh = content.getDataHandler();
         assertEquals("some content", dh.getContent());
     }
     

Modified: webservices/axiom/trunk/samples/src/test/java/org/apache/axiom/samples/MTOMSample.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/samples/src/test/java/org/apache/axiom/samples/MTOMSample.java?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/samples/src/test/java/org/apache/axiom/samples/MTOMSample.java (original)
+++ webservices/axiom/trunk/samples/src/test/java/org/apache/axiom/samples/MTOMSample.java Sat Feb 13 21:10:07 2016
@@ -70,7 +70,7 @@ public class MTOMSample extends TestCase
         OMElement retrieveContentResponse = response.getBody().getFirstElement();
         OMElement content = retrieveContentResponse.getFirstElement();
         // Extract the DataHandler representing the optimized binary data
-        DataHandler dh = (DataHandler)((OMText)content.getFirstOMChild()).getDataHandler();
+        DataHandler dh = ((OMText)content.getFirstOMChild()).getDataHandler();
         InputStream contentStream;
         // If possible, stream the content of the MIME part (feature available in Axiom 1.2.13)
         if (dh instanceof DataHandlerExt) {

Modified: webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md (original)
+++ webservices/axiom/trunk/src/site/markdown/release-notes/1.3.0.md Sat Feb 13 21:10:07 2016
@@ -10,6 +10,9 @@ Changes in this release
 *   The public API now uses generics. Note that this should in general not have
     impact on binary compatibility with Axiom 1.2.x.
 
+*   The `getDataHandler()` method defined by `OMText` has been modified to use
+    `DataHandler` instead of `Object` as return type.
+
 *   The builder implementations and related classes have been removed from the
     `org.apache.axiom.om.impl.builder` and `org.apache.axiom.soap.impl.builder`
     packages. This includes the `StAXBuilder`, `StAXOMBuilder`,

Modified: webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/attachments/ImageSampleTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/attachments/ImageSampleTest.java?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/attachments/ImageSampleTest.java (original)
+++ webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/attachments/ImageSampleTest.java Sat Feb 13 21:10:07 2016
@@ -118,7 +118,7 @@ public class ImageSampleTest extends Abs
          */
 
         DataHandler actualDH;
-        actualDH = (DataHandler) blob.getDataHandler();
+        actualDH = blob.getDataHandler();
         BufferedImage bufferedImage = ImageIO.read(actualDH.getDataSource().getInputStream());
         this.saveImage("image/jpeg", bufferedImage, new FileOutputStream(imageOutFileName));
         

Modified: webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java (original)
+++ webservices/axiom/trunk/systests/old-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java Sat Feb 13 21:10:07 2016
@@ -127,7 +127,7 @@ public class MTOMStAXSOAPModelBuilderTes
         byte[] expectedObject = new byte[] { 13, 56, 65, 32, 12, 12, 7, -3, -2,
                 -1, 98 };
         DataHandler actualDH;
-        actualDH = (DataHandler) blob.getDataHandler();
+        actualDH = blob.getDataHandler();
         //ByteArrayInputStream object = (ByteArrayInputStream) actualDH
         //.getContent();
         //byte[] actualObject= null;
@@ -163,7 +163,7 @@ public class MTOMStAXSOAPModelBuilderTes
         for (Iterator it = binaryNodes.iterator(); it.hasNext(); ) {
             // Request the DataHandler and do something with it to make sure
             // the part is loaded
-            ((DataHandler)((OMText)it.next()).getDataHandler()).getInputStream().close();
+            ((OMText)it.next()).getDataHandler().getInputStream().close();
         }
         assertEquals(binaryNodes.size() + 1, attachments.getContentIDList().size());
     }

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestReadAttachmentBeforeRootPartComplete.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestReadAttachmentBeforeRootPartComplete.java?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestReadAttachmentBeforeRootPartComplete.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestReadAttachmentBeforeRootPartComplete.java Sat Feb 13 21:10:07 2016
@@ -87,7 +87,7 @@ public class TestReadAttachmentBeforeRoo
         OMText text = (OMText)child1.getFirstOMChild();
         assertTrue(text.isBinary());
         // Access the DataHandler
-        DataHandler dh = (DataHandler)text.getDataHandler();
+        DataHandler dh = text.getDataHandler();
         IOTestUtils.compareStreams(ds.getInputStream(), dh.getInputStream());
         OMElement child2 = (OMElement)child1.getNextOMSibling();
         assertFalse(child2.isComplete());

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromDataHandlerProvider.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromDataHandlerProvider.java?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromDataHandlerProvider.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/factory/TestCreateOMTextFromDataHandlerProvider.java Sat Feb 13 21:10:07 2016
@@ -55,7 +55,7 @@ public class TestCreateOMTextFromDataHan
         OMFactory factory = metaFactory.getOMFactory();
         OMText text = factory.createOMText(null, prov, true);
         assertFalse(prov.isDataHandlerCreated());
-        assertEquals(((DataHandler)text.getDataHandler()).getContent(), "Data");
+        assertEquals(text.getDataHandler().getContent(), "Data");
         assertTrue(prov.isDataHandlerCreated());
     }
 }

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerProviderScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerProviderScenario.java?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerProviderScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerProviderScenario.java Sat Feb 13 21:10:07 2016
@@ -77,7 +77,7 @@ public class WriteDataHandlerProviderSce
             Assert.assertSame(dh, child.getDataHandler());
         } else {
             child.setBinary(true);
-            IOTestUtils.compareStreams(dh.getInputStream(), ((DataHandler)child.getDataHandler()).getInputStream());
+            IOTestUtils.compareStreams(dh.getInputStream(), child.getDataHandler().getInputStream());
         }
     }
 }

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerScenario.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerScenario.java?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerScenario.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/push/WriteDataHandlerScenario.java Sat Feb 13 21:10:07 2016
@@ -68,7 +68,7 @@ public class WriteDataHandlerScenario im
         } else {
             // TODO: this will only work if a single text node was created
             child.setBinary(true);
-            IOTestUtils.compareStreams(dh.getInputStream(), ((DataHandler)child.getDataHandler()).getInputStream());
+            IOTestUtils.compareStreams(dh.getInputStream(), child.getDataHandler().getInputStream());
         }
     }
 }

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/envelope/TestBuildWithAttachments.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/envelope/TestBuildWithAttachments.java?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/envelope/TestBuildWithAttachments.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/envelope/TestBuildWithAttachments.java Sat Feb 13 21:10:07 2016
@@ -49,10 +49,10 @@ public class TestBuildWithAttachments ex
         OMElement image1 = it.next();
         OMElement image2 = it.next();
         
-        IOTestUtils.compareStreams(((DataHandler)((OMText)image1.getFirstOMChild()).getDataHandler()).getInputStream(),
+        IOTestUtils.compareStreams(((OMText)image1.getFirstOMChild()).getDataHandler().getInputStream(),
                 sample.getPart(1));
 
-        IOTestUtils.compareStreams(((DataHandler)((OMText)image2.getFirstOMChild()).getDataHandler()).getInputStream(),
+        IOTestUtils.compareStreams(((OMText)image2.getFirstOMChild()).getDataHandler().getInputStream(),
                 sample.getPart(2));
     }
 }

Modified: webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestBuilderDetach.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestBuilderDetach.java?rev=1730268&r1=1730267&r2=1730268&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestBuilderDetach.java (original)
+++ webservices/axiom/trunk/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/mtom/TestBuilderDetach.java Sat Feb 13 21:10:07 2016
@@ -22,8 +22,6 @@ import static org.apache.axiom.truth.Axi
 
 import java.util.Iterator;
 
-import javax.activation.DataHandler;
-
 import org.apache.axiom.attachments.Attachments;
 import org.apache.axiom.om.OMMetaFactory;
 import org.apache.axiom.om.OMNode;
@@ -60,7 +58,7 @@ public class TestBuilderDetach extends A
                 if (text.isBinary()) {
                     IOTestUtils.compareStreams(
                             sample.getPart(text.getContentID()),
-                            ((DataHandler)text.getDataHandler()).getInputStream());
+                            text.getDataHandler().getInputStream());
                     binaryCount++;
                 }
             }