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/ws-axiom.git
The following commit(s) were added to refs/heads/master by this push:
new 448b01706 [AXIOM-506] Migrate OMFactory to Blob
448b01706 is described below
commit 448b017067e65f764de3e80a2aedcd26dd787468
Author: Andreas Veithen <andreas.veit...@gmail.com>
AuthorDate: Sun Nov 6 17:40:56 2022 +0000
[AXIOM-506] Migrate OMFactory to Blob
---
axiom-api/pom.xml | 1 -
.../src/main/java/org/apache/axiom/om/OMFactory.java | 8 +-------
.../axiom/om/impl/common/factory/OMFactoryImpl.java | 15 +++------------
.../test/java/org/apache/axiom/samples/MTOMLogSample.java | 3 ++-
.../java/org/apache/axiom/om/impl/llom/OMOutputTest.java | 8 ++------
.../RegisterCustomBuilderForPayloadJAXBTestCase.java | 3 ++-
.../builder/TestReadAttachmentBeforeRootPartComplete.java | 4 +++-
.../org/apache/axiom/ts/om/element/TestGetTextBinary.java | 3 ++-
.../element/TestUnmarshalWithDataHandlerToByteArray.java | 5 ++++-
.../axiom/ts/om/element/sr/TestGetBlobFromElement.java | 4 +++-
.../ts/om/text/TestBase64StreamingWithGetSAXSource.java | 3 ++-
.../ts/om/text/TestBase64StreamingWithSerialize.java | 3 ++-
.../ts/om/text/TestGetTextCharactersFromDataHandler.java | 3 ++-
.../java/org/apache/axiom/ts/om/xop/XOPRoundtripTest.java | 2 +-
.../apache/axiom/ts/omdom/text/TestCloneNodeBinary.java | 4 +++-
.../axiom/ts/omdom/text/TestGetNodeValueBinary.java | 4 +++-
.../ts/soap12/envelope/TestMTOMForwardStreaming.java | 6 ++++--
17 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/axiom-api/pom.xml b/axiom-api/pom.xml
index 6d6694065..cd5329136 100644
--- a/axiom-api/pom.xml
+++ b/axiom-api/pom.xml
@@ -269,7 +269,6 @@
org.apache.axiom.util.base64.Base64Utils ->
javax.activation.DataSource,
org.apache.axiom.util.base64.Base64Utils ->
javax.activation.DataHandler,
org.apache.axiom.om.impl.MTOMXMLStreamWriter
-> javax.activation.DataHandler,
- org.apache.axiom.om.OMFactory ->
javax.activation.DataHandler,
<!-- o.a.a.soap should be a layer on top of
o.a.a.om -->
org.apache.axiom.om.OMAbstractFactory ->
org.apache.axiom.soap.SOAPFactory,
org.apache.axiom.om.OMMetaFactory ->
org.apache.axiom.soap.SOAPFactory,
diff --git a/axiom-api/src/main/java/org/apache/axiom/om/OMFactory.java
b/axiom-api/src/main/java/org/apache/axiom/om/OMFactory.java
index e6541afe4..801250b71 100644
--- a/axiom-api/src/main/java/org/apache/axiom/om/OMFactory.java
+++ b/axiom-api/src/main/java/org/apache/axiom/om/OMFactory.java
@@ -19,7 +19,6 @@
package org.apache.axiom.om;
-import javax.activation.DataHandler;
import javax.xml.namespace.QName;
import org.apache.axiom.blob.Blob;
@@ -286,12 +285,7 @@ public interface OMFactory {
OMText createOMText(String s, String mimeType, boolean optimize);
- /**
- * @deprecated Use {@link #createOMText(DataHandler, boolean)} instead.
- */
- OMText createOMText(Object dataHandler, boolean optimize);
-
- OMText createOMText(DataHandler dataHandler, boolean optimize);
+ OMText createOMText(Blob blob, boolean optimize);
OMText createOMText(OMContainer parent, String s, String mimeType,
boolean optimize);
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
index ca3d8f705..790655c09 100644
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
+++
b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/OMFactoryImpl.java
@@ -22,9 +22,9 @@ import static
org.apache.axiom.util.xml.NSUtils.generatePrefix;
import java.util.Iterator;
-import javax.activation.DataHandler;
import javax.xml.namespace.QName;
+import org.apache.axiom.blob.Blob;
import org.apache.axiom.core.CoreModelException;
import org.apache.axiom.ext.stax.BlobProvider;
import org.apache.axiom.om.OMAttribute;
@@ -64,7 +64,6 @@ import org.apache.axiom.om.impl.intf.AxiomText;
import org.apache.axiom.om.impl.intf.TextContent;
import org.apache.axiom.om.impl.intf.factory.AxiomElementType;
import org.apache.axiom.om.impl.intf.factory.AxiomNodeFactory;
-import org.apache.axiom.util.activation.DataHandlerUtils;
public class OMFactoryImpl implements OMFactory {
protected final AxiomNodeFactory nodeFactory;
@@ -207,16 +206,8 @@ public class OMFactoryImpl implements OMFactory {
}
@Override
- public final OMText createOMText(Object dataHandler, boolean optimize) {
- return createOMText((DataHandler) dataHandler, optimize);
- }
-
- @Override
- public final OMText createOMText(DataHandler dataHandler, boolean
optimize) {
- return createAxiomText(
- null,
- new TextContent(null, DataHandlerUtils.toBlob(dataHandler),
optimize),
- OMNode.TEXT_NODE);
+ public final OMText createOMText(Blob blob, boolean optimize) {
+ return createAxiomText(null, new TextContent(null, blob, optimize),
OMNode.TEXT_NODE);
}
@Override
diff --git a/samples/src/test/java/org/apache/axiom/samples/MTOMLogSample.java
b/samples/src/test/java/org/apache/axiom/samples/MTOMLogSample.java
index b30a23d0a..aa3c23f6e 100644
--- a/samples/src/test/java/org/apache/axiom/samples/MTOMLogSample.java
+++ b/samples/src/test/java/org/apache/axiom/samples/MTOMLogSample.java
@@ -32,6 +32,7 @@ import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAPFactory;
+import org.apache.axiom.util.activation.DataHandlerUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -52,7 +53,7 @@ public class MTOMLogSample extends TestCase {
SOAPFactory factory = OMAbstractFactory.getSOAP11Factory();
SOAPEnvelope env =
factory.createDefaultSOAPMessage().getSOAPEnvelope();
OMElement element = factory.createOMElement(new
QName("urn:testService", "invokeMtom", "ns"), env.getBody());
- element.addChild(factory.createOMText(new DataHandler("test",
"text/xml"), true));
+ element.addChild(factory.createOMText(DataHandlerUtils.toBlob(new
DataHandler("test", "text/xml")), true));
logMessage(env);
}
}
diff --git
a/systests/old-tests/src/test/java/org/apache/axiom/om/impl/llom/OMOutputTest.java
b/systests/old-tests/src/test/java/org/apache/axiom/om/impl/llom/OMOutputTest.java
index 411086d91..7fecd3302 100644
---
a/systests/old-tests/src/test/java/org/apache/axiom/om/impl/llom/OMOutputTest.java
+++
b/systests/old-tests/src/test/java/org/apache/axiom/om/impl/llom/OMOutputTest.java
@@ -19,7 +19,7 @@
package org.apache.axiom.om.impl.llom;
-import org.apache.axiom.attachments.ByteArrayDataSource;
+import org.apache.axiom.blob.Blobs;
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
@@ -29,8 +29,6 @@ import org.apache.axiom.om.OMOutputFormat;
import org.apache.axiom.om.OMText;
import org.apache.commons.io.output.NullOutputStream;
-import javax.activation.DataHandler;
-
import junit.framework.TestCase;
public class OMOutputTest extends TestCase {
@@ -42,7 +40,6 @@ public class OMOutputTest extends TestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
- DataHandler dataHandler;
OMFactory fac = OMAbstractFactory.getOMFactory();
@@ -64,8 +61,7 @@ public class OMOutputTest extends TestCase {
text.addAttribute(cType1);
byte[] byteArray = new byte[] { 13, 56, 65, 32, 12, 12, 7, -3, -2, -1,
98 };
- dataHandler = new DataHandler(new ByteArrayDataSource(byteArray));
- OMText textData = fac.createOMText(dataHandler, false);
+ OMText textData = fac.createOMText(Blobs.createBlob(byteArray), false);
envelope.addChild(body);
body.addChild(data);
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/RegisterCustomBuilderForPayloadJAXBTestCase.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/RegisterCustomBuilderForPayloadJAXBTestCase.java
index ed2dcd8ed..9803a5df0 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/RegisterCustomBuilderForPayloadJAXBTestCase.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/RegisterCustomBuilderForPayloadJAXBTestCase.java
@@ -31,6 +31,7 @@ import org.apache.axiom.om.ds.custombuilder.CustomBuilder;
import org.apache.axiom.om.ds.custombuilder.CustomBuilderSupport;
import org.apache.axiom.testutils.io.IOTestUtils;
import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.util.activation.DataHandlerUtils;
public abstract class RegisterCustomBuilderForPayloadJAXBTestCase extends
AxiomTestCase {
public RegisterCustomBuilderForPayloadJAXBTestCase(OMMetaFactory
metaFactory) {
@@ -44,7 +45,7 @@ public abstract class
RegisterCustomBuilderForPayloadJAXBTestCase extends AxiomT
name.setText("some name");
document.addChild(name);
OMElement content = factory.createOMElement(new QName("content"));
- content.addChild(factory.createOMText(dh, true));
+ content.addChild(factory.createOMText(DataHandlerUtils.toBlob(dh),
true));
document.addChild(content);
return document;
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestReadAttachmentBeforeRootPartComplete.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestReadAttachmentBeforeRootPartComplete.java
index 69fbfa815..9a66a0839 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestReadAttachmentBeforeRootPartComplete.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestReadAttachmentBeforeRootPartComplete.java
@@ -38,6 +38,7 @@ import org.apache.axiom.om.util.StAXParserConfiguration;
import org.apache.axiom.testutils.RandomUtils;
import org.apache.axiom.testutils.activation.RandomDataSource;
import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.util.activation.DataHandlerUtils;
import org.apache.axiom.testutils.io.IOTestUtils;
/**
@@ -67,7 +68,8 @@ public class TestReadAttachmentBeforeRootPartComplete extends
AxiomTestCase {
OMElement orgRoot = factory.createOMElement("root", null);
OMElement orgChild1 = factory.createOMElement("child1", null, orgRoot);
DataSource ds = new RandomDataSource(54321, 4096);
- orgChild1.addChild(factory.createOMText(new DataHandler(ds), true));
+ orgChild1.addChild(
+ factory.createOMText(DataHandlerUtils.toBlob(new
DataHandler(ds)), true));
// Create a child with a large text content and insert it after the
binary node.
// If we don't do this, then the root part may be buffered entirely by
the parser,
// and the test would not be effective.
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextBinary.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextBinary.java
index 892138247..2b4d0f2b0 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextBinary.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextBinary.java
@@ -31,6 +31,7 @@ import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.testutils.activation.RandomDataSource;
import org.apache.axiom.testutils.io.IOTestUtils;
import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.util.activation.DataHandlerUtils;
import org.apache.commons.codec.binary.Base64;
/**
@@ -51,7 +52,7 @@ public class TestGetTextBinary extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
DataSource ds = new RandomDataSource(99999, 1000);
OMElement element = factory.createOMElement("elem", null);
- element.addChild(factory.createOMText(new DataHandler(ds), false));
+ element.addChild(factory.createOMText(DataHandlerUtils.toBlob(new
DataHandler(ds)), false));
if (compact) {
// Only the builder can create a compact element containing a
DataHandler
element =
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestUnmarshalWithDataHandlerToByteArray.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestUnmarshalWithDataHandlerToByteArray.java
index e84cb0ee4..9845ce1ef 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestUnmarshalWithDataHandlerToByteArray.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestUnmarshalWithDataHandlerToByteArray.java
@@ -31,6 +31,7 @@ import org.apache.axiom.om.util.jaxb.JAXBUtils;
import org.apache.axiom.testutils.activation.TextDataSource;
import org.apache.axiom.ts.AxiomTestCase;
import org.apache.axiom.ts.jaxb.beans.DocumentBean2;
+import org.apache.axiom.util.activation.DataHandlerUtils;
public class TestUnmarshalWithDataHandlerToByteArray extends AxiomTestCase {
public TestUnmarshalWithDataHandlerToByteArray(OMMetaFactory metaFactory) {
@@ -46,7 +47,9 @@ public class TestUnmarshalWithDataHandlerToByteArray extends
AxiomTestCase {
OMElement content = factory.createOMElement("content", ns, element);
content.addChild(
factory.createOMText(
- new DataHandler(new TextDataSource("test content",
"utf-8", "plain")),
+ DataHandlerUtils.toBlob(
+ new DataHandler(
+ new TextDataSource("test content",
"utf-8", "plain"))),
true));
JAXBContext context = JAXBContext.newInstance(DocumentBean2.class);
DocumentBean2 bean = (DocumentBean2) JAXBUtils.unmarshal(element,
context, null, true);
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetBlobFromElement.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetBlobFromElement.java
index 67e9bf048..d11f3f462 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetBlobFromElement.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/sr/TestGetBlobFromElement.java
@@ -32,6 +32,7 @@ import org.apache.axiom.om.OMXMLBuilderFactory;
import org.apache.axiom.testutils.activation.RandomDataSource;
import org.apache.axiom.testutils.io.IOTestUtils;
import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.util.activation.DataHandlerUtils;
import org.apache.axiom.util.stax.XMLStreamReaderUtils;
/**
@@ -53,7 +54,8 @@ public class TestGetBlobFromElement extends AxiomTestCase {
RandomDataSource orgDS = new RandomDataSource(64 * 1024);
OMElement orgRoot = factory.createOMElement(new QName("root"));
OMElement orgChild = factory.createOMElement(new QName("child"),
orgRoot);
- orgChild.addChild(factory.createOMText(new DataHandler(orgDS), false));
+ orgChild.addChild(
+ factory.createOMText(DataHandlerUtils.toBlob(new
DataHandler(orgDS)), false));
OMElement root =
OMXMLBuilderFactory.createOMBuilder(factory, new
StringReader(orgRoot.toString()))
.getDocumentElement();
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestBase64StreamingWithGetSAXSource.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestBase64StreamingWithGetSAXSource.java
index 5b8f12a97..94c0bb365 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestBase64StreamingWithGetSAXSource.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestBase64StreamingWithGetSAXSource.java
@@ -34,6 +34,7 @@ import org.apache.axiom.om.OMText;
import org.apache.axiom.testutils.activation.RandomDataSource;
import org.apache.axiom.testutils.io.ByteStreamComparator;
import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.util.activation.DataHandlerUtils;
import org.apache.axiom.util.base64.Base64DecodingOutputStreamWriter;
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
@@ -85,7 +86,7 @@ public class TestBase64StreamingWithGetSAXSource extends
AxiomTestCase {
// doesn't fail with an OutOfMemoryError, we know that the OMText
implementation
// supports streaming.
DataSource ds = new RandomDataSource(654321L,
Runtime.getRuntime().maxMemory());
- OMText text = factory.createOMText(new DataHandler(ds), false);
+ OMText text = factory.createOMText(DataHandlerUtils.toBlob(new
DataHandler(ds)), false);
elem.addChild(text);
SAXSource saxSource = elem.getSAXSource(true);
XMLReader xmlReader = saxSource.getXMLReader();
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestBase64StreamingWithSerialize.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestBase64StreamingWithSerialize.java
index d574ab1ad..f8475b633 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestBase64StreamingWithSerialize.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestBase64StreamingWithSerialize.java
@@ -27,6 +27,7 @@ import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMText;
import org.apache.axiom.testutils.activation.TestDataSource;
import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.util.activation.DataHandlerUtils;
import org.apache.commons.io.output.NullOutputStream;
/**
@@ -49,7 +50,7 @@ public class TestBase64StreamingWithSerialize extends
AxiomTestCase {
// doesn't fail with an OutOfMemoryError, we know that the OMText
implementation
// supports streaming.
DataSource ds = new TestDataSource('A',
Runtime.getRuntime().maxMemory());
- OMText text = factory.createOMText(new DataHandler(ds), false);
+ OMText text = factory.createOMText(DataHandlerUtils.toBlob(new
DataHandler(ds)), false);
elem.addChild(text);
elem.serialize(NullOutputStream.NULL_OUTPUT_STREAM);
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestGetTextCharactersFromDataHandler.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestGetTextCharactersFromDataHandler.java
index 2133013ce..7f95ae125 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestGetTextCharactersFromDataHandler.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/text/TestGetTextCharactersFromDataHandler.java
@@ -24,6 +24,7 @@ import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.om.OMText;
import org.apache.axiom.testutils.activation.TextDataSource;
import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.util.activation.DataHandlerUtils;
import org.apache.commons.codec.binary.Base64;
/**
@@ -39,7 +40,7 @@ public class TestGetTextCharactersFromDataHandler extends
AxiomTestCase {
@Override
protected void runTest() throws Throwable {
DataHandler dh = new DataHandler(new TextDataSource("test content",
"utf-8", "plain"));
- OMText text = metaFactory.getOMFactory().createOMText(dh, true);
+ OMText text =
metaFactory.getOMFactory().createOMText(DataHandlerUtils.toBlob(dh), true);
char[] chars = text.getTextCharacters();
byte[] decoded = Base64.decodeBase64(new String(chars));
assertEquals("test content", new String(decoded, "utf-8"));
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/XOPRoundtripTest.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/XOPRoundtripTest.java
index ec933368d..1467d75aa 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/XOPRoundtripTest.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/xop/XOPRoundtripTest.java
@@ -43,7 +43,7 @@ public class XOPRoundtripTest extends AxiomTestCase {
OMFactory factory = metaFactory.getOMFactory();
DataHandler dh = new DataHandler(new TestDataSource('x',
Runtime.getRuntime().maxMemory()));
OMElement element1 = factory.createOMElement(new QName("test"));
- element1.addChild(factory.createOMText(dh, true));
+ element1.addChild(factory.createOMText(DataHandlerUtils.toBlob(dh),
true));
XOPEncoded<XMLStreamReader> xopEncodedStream =
element1.getXOPEncodedStreamReader(true);
OMElement element2 =
OMXMLBuilderFactory.createOMBuilder(
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/text/TestCloneNodeBinary.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/text/TestCloneNodeBinary.java
index a14a02506..cccbb550b 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/text/TestCloneNodeBinary.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/text/TestCloneNodeBinary.java
@@ -25,6 +25,7 @@ import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.testutils.activation.RandomDataSource;
import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.util.activation.DataHandlerUtils;
import org.w3c.dom.Text;
public class TestCloneNodeBinary extends AxiomTestCase {
@@ -36,7 +37,8 @@ public class TestCloneNodeBinary extends AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
DataSource ds = new RandomDataSource(666L, 1000);
- Text text = (Text) factory.createOMText(new DataHandler(ds), false);
+ Text text =
+ (Text) factory.createOMText(DataHandlerUtils.toBlob(new
DataHandler(ds)), false);
String base64 = text.getData();
assertTrue(base64.length() > 0);
assertEquals(base64, ((Text) text.cloneNode(true)).getData());
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/text/TestGetNodeValueBinary.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/text/TestGetNodeValueBinary.java
index 74e3a92d5..27337686a 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/text/TestGetNodeValueBinary.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/omdom/text/TestGetNodeValueBinary.java
@@ -30,6 +30,7 @@ import org.apache.axiom.om.OMMetaFactory;
import org.apache.axiom.testutils.activation.RandomDataSource;
import org.apache.axiom.testutils.io.IOTestUtils;
import org.apache.axiom.ts.AxiomTestCase;
+import org.apache.axiom.util.activation.DataHandlerUtils;
import org.apache.commons.codec.binary.Base64;
import org.w3c.dom.Text;
@@ -42,7 +43,8 @@ public class TestGetNodeValueBinary extends AxiomTestCase {
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
DataSource ds = new RandomDataSource(666L, 1000);
- Text text = (Text) factory.createOMText(new DataHandler(ds), false);
+ Text text =
+ (Text) factory.createOMText(DataHandlerUtils.toBlob(new
DataHandler(ds)), false);
String nodeValue = text.getNodeValue();
assertThat(nodeValue).isNotNull();
IOTestUtils.compareStreams(
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/envelope/TestMTOMForwardStreaming.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/envelope/TestMTOMForwardStreaming.java
index 25e41df4d..ea65fde9c 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/envelope/TestMTOMForwardStreaming.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/soap12/envelope/TestMTOMForwardStreaming.java
@@ -69,9 +69,11 @@ public class TestMTOMForwardStreaming extends AxiomTestCase {
factory.createOMElement(
"test", factory.createOMNamespace("urn:test", "p"),
orgBody);
OMElement orgData1 = factory.createOMElement("data", null,
orgBodyElement);
- orgData1.addChild(factory.createOMText(new DataHandler(ds1), true));
+ orgData1.addChild(
+ factory.createOMText(DataHandlerUtils.toBlob(new
DataHandler(ds1)), true));
OMElement orgData2 = factory.createOMElement("data", null,
orgBodyElement);
- orgData2.addChild(factory.createOMText(new DataHandler(ds2), true));
+ orgData2.addChild(
+ factory.createOMText(DataHandlerUtils.toBlob(new
DataHandler(ds2)), true));
OMOutputFormat format = new OMOutputFormat();
format.setDoOptimize(true);
