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 69469d686 Replace usages of some deprecated commons-io APIs
69469d686 is described below
commit 69469d68692d0ba8b60968ee1a1f14f7157d49d9
Author: Andreas Veithen-Knowles <[email protected]>
AuthorDate: Sun Mar 1 12:00:56 2026 +0000
Replace usages of some deprecated commons-io APIs
---
.../dialect/TestGetPrefixAfterWriteDefaultNamespace.java | 2 +-
.../stax/dialect/TestGetPrefixAfterWriteNamespace.java | 2 +-
.../java/org/apache/axiom/attachments/AttachmentsTest.java | 6 +++---
.../apache/axiom/blob/suite/TestWriteToIllegalState.java | 4 +---
.../axiom/core/stream/serializer/SerializerTest.java | 14 +++++++-------
.../java/org/apache/axiom/om/impl/llom/OMOutputTest.java | 4 ++--
.../src/main/java/org/apache/axiom/ts/AxiomTestCase.java | 2 +-
.../axiom/ts/om/document/TestSerializeAndConsume.java | 2 +-
.../axiom/ts/om/text/TestBase64StreamingWithSerialize.java | 2 +-
9 files changed, 18 insertions(+), 20 deletions(-)
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetPrefixAfterWriteDefaultNamespace.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetPrefixAfterWriteDefaultNamespace.java
index 7f4807d99..b26e5bdaf 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetPrefixAfterWriteDefaultNamespace.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetPrefixAfterWriteDefaultNamespace.java
@@ -35,7 +35,7 @@ public class TestGetPrefixAfterWriteDefaultNamespace extends
DialectTestCase {
protected void runTest() throws Throwable {
XMLStreamWriter writer =
staxImpl.newNormalizedXMLOutputFactory()
-
.createXMLStreamWriter(NullOutputStream.NULL_OUTPUT_STREAM);
+ .createXMLStreamWriter(NullOutputStream.INSTANCE);
writer.writeStartElement("ns1", "root", "urn:ns1");
writer.writeDefaultNamespace("urn:ns2");
assertEquals("", writer.getPrefix("urn:ns2"));
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetPrefixAfterWriteNamespace.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetPrefixAfterWriteNamespace.java
index 7856ba6e0..9ea36b0a1 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetPrefixAfterWriteNamespace.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetPrefixAfterWriteNamespace.java
@@ -35,7 +35,7 @@ public class TestGetPrefixAfterWriteNamespace extends
DialectTestCase {
protected void runTest() throws Throwable {
XMLStreamWriter writer =
staxImpl.newNormalizedXMLOutputFactory()
-
.createXMLStreamWriter(NullOutputStream.NULL_OUTPUT_STREAM);
+ .createXMLStreamWriter(NullOutputStream.INSTANCE);
writer.writeStartElement("", "root", "");
writer.writeNamespace("p", "urn:test");
assertEquals("p", writer.getPrefix("urn:test"));
diff --git
a/axiom-legacy-attachments/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java
b/axiom-legacy-attachments/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java
index 79b38c138..78be3c647 100644
---
a/axiom-legacy-attachments/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java
+++
b/axiom-legacy-attachments/src/test/java/org/apache/axiom/attachments/AttachmentsTest.java
@@ -520,7 +520,7 @@ public class AttachmentsTest extends AbstractTestCase {
DataHandler dh =
attachments.getDataHandler("__WLS__1188904239162__SOAP__");
assertTrue(dh instanceof DataHandlerExt);
InputStream content = dh.getInputStream();
- IOUtils.copy(content, NullOutputStream.NULL_OUTPUT_STREAM);
+ IOUtils.copy(content, NullOutputStream.INSTANCE);
content.close();
assertEquals(1, manager.getFileCount());
@@ -552,14 +552,14 @@ public class AttachmentsTest extends AbstractTestCase {
// Read the attachment once to make sure it is buffered
DataHandler dh =
attachments.getDataHandler("__WLS__1188904239162__SOAP__");
InputStream content = dh.getInputStream();
- IOUtils.copy(content, NullOutputStream.NULL_OUTPUT_STREAM);
+ IOUtils.copy(content, NullOutputStream.INSTANCE);
content.close();
assertEquals(1, manager.getFileCount());
// Now consume the content of the attachment
content = ((DataHandlerExt) dh).readOnce();
- IOUtils.copy(content, NullOutputStream.NULL_OUTPUT_STREAM);
+ IOUtils.copy(content, NullOutputStream.INSTANCE);
content.close();
// The temporary file should have been deleted
diff --git
a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestWriteToIllegalState.java
b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestWriteToIllegalState.java
index d8d05daa2..5ac4458b5 100644
---
a/components/blob/src/test/java/org/apache/axiom/blob/suite/TestWriteToIllegalState.java
+++
b/components/blob/src/test/java/org/apache/axiom/blob/suite/TestWriteToIllegalState.java
@@ -32,8 +32,6 @@ public class TestWriteToIllegalState extends
WritableBlobTestCase {
@Override
protected void runTest(WritableBlob blob) throws Throwable {
- assertThrows(
- IllegalStateException.class,
- () -> blob.writeTo(NullOutputStream.NULL_OUTPUT_STREAM));
+ assertThrows(IllegalStateException.class, () ->
blob.writeTo(NullOutputStream.INSTANCE));
}
}
diff --git
a/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/SerializerTest.java
b/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/SerializerTest.java
index 7920e5e60..ef740c03a 100644
---
a/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/SerializerTest.java
+++
b/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/SerializerTest.java
@@ -114,7 +114,7 @@ public class SerializerTest {
@Test(expected = StreamException.class)
public void testUnmappableCharacterInComment() throws Exception {
- Serializer handler = new
Serializer(NullOutputStream.NULL_OUTPUT_STREAM, "iso-8859-1");
+ Serializer handler = new Serializer(NullOutputStream.INSTANCE,
"iso-8859-1");
handler.startFragment();
handler.startComment();
handler.processCharacterData("\u20AC", false);
@@ -124,7 +124,7 @@ public class SerializerTest {
@Test(expected = StreamException.class)
public void testUnmappableCharacterInCDATASection() throws Exception {
- Serializer handler = new
Serializer(NullOutputStream.NULL_OUTPUT_STREAM, "ascii");
+ Serializer handler = new Serializer(NullOutputStream.INSTANCE,
"ascii");
handler.startFragment();
handler.startCDATASection();
handler.processCharacterData("c'est la fête!", false);
@@ -134,7 +134,7 @@ public class SerializerTest {
@Test(expected = StreamException.class)
public void testUnmappableCharacterInProcessingInstruction() throws
Exception {
- Serializer handler = new
Serializer(NullOutputStream.NULL_OUTPUT_STREAM, "ascii");
+ Serializer handler = new Serializer(NullOutputStream.INSTANCE,
"ascii");
handler.startFragment();
handler.startProcessingInstruction("test");
handler.processCharacterData("c'est la fête!", false);
@@ -144,7 +144,7 @@ public class SerializerTest {
@Test(expected = StreamException.class)
public void testUnmappableCharacterInName() throws Exception {
- Serializer handler = new
Serializer(NullOutputStream.NULL_OUTPUT_STREAM, "iso-8859-15");
+ Serializer handler = new Serializer(NullOutputStream.INSTANCE,
"iso-8859-15");
handler.startFragment();
handler.startElement("", "\u0370", "");
handler.attributesCompleted();
@@ -154,7 +154,7 @@ public class SerializerTest {
@Test(expected = IllegalCharacterSequenceException.class)
public void testIllegalCharacterSequenceInComment() throws Exception {
- Serializer handler = new Serializer(new NullWriter());
+ Serializer handler = new Serializer(NullWriter.INSTANCE);
handler.startFragment();
handler.startComment();
handler.processCharacterData("abc--def", false);
@@ -164,7 +164,7 @@ public class SerializerTest {
@Test(expected = IllegalCharacterSequenceException.class)
public void testIllegalCharacterSequenceInProcessingInstruction() throws
Exception {
- Serializer handler = new Serializer(new NullWriter());
+ Serializer handler = new Serializer(NullWriter.INSTANCE);
handler.startFragment();
handler.startProcessingInstruction("test");
handler.processCharacterData("aaa???>bbb", false);
@@ -174,7 +174,7 @@ public class SerializerTest {
@Test(expected = IllegalCharacterSequenceException.class)
public void testIllegalCharacterSequenceInCDATASection() throws Exception {
- Serializer handler = new Serializer(new NullWriter());
+ Serializer handler = new Serializer(NullWriter.INSTANCE);
handler.startFragment();
handler.startCDATASection();
handler.processCharacterData("xxx]]]", false);
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 ad334259c..6fc3a4bb9 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
@@ -71,7 +71,7 @@ public class OMOutputTest extends TestCase {
OMOutputFormat baseOutputFormat = new OMOutputFormat();
baseOutputFormat.setDoOptimize(false);
- envelope.serializeAndConsume(NullOutputStream.NULL_OUTPUT_STREAM,
baseOutputFormat);
- envelope.serializeAndConsume(NullOutputStream.NULL_OUTPUT_STREAM,
mtomOutputFormat);
+ envelope.serializeAndConsume(NullOutputStream.INSTANCE,
baseOutputFormat);
+ envelope.serializeAndConsume(NullOutputStream.INSTANCE,
mtomOutputFormat);
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java
index 98c18f72b..6ad3f8441 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/AxiomTestCase.java
@@ -57,7 +57,7 @@ public abstract class AxiomTestCase extends MatrixTestCase {
assertFalse("Expected the node to be incomplete",
container.isComplete());
boolean isConsumed;
try {
- container.serialize(NullOutputStream.NULL_OUTPUT_STREAM);
+ container.serialize(NullOutputStream.INSTANCE);
isConsumed = false;
} catch (Exception ex) {
isConsumed = true;
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeAndConsume.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeAndConsume.java
index 834f5dbc0..67f125d72 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeAndConsume.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeAndConsume.java
@@ -44,7 +44,7 @@ public class TestSerializeAndConsume extends AxiomTestCase {
OMDocument document =
OMXMLBuilderFactory.createOMBuilder(factory, new
StringReader("<elem>text</elem>"))
.getDocument();
- document.serializeAndConsume(NullOutputStream.NULL_OUTPUT_STREAM);
+ document.serializeAndConsume(NullOutputStream.INSTANCE);
assertConsumed(document);
}
}
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 cbb700d1d..3787c629f 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
@@ -47,6 +47,6 @@ public class TestBase64StreamingWithSerialize extends
AxiomTestCase {
OMText text =
factory.createOMText(new TestBlob('A',
Runtime.getRuntime().maxMemory()), false);
elem.addChild(text);
- elem.serialize(NullOutputStream.NULL_OUTPUT_STREAM);
+ elem.serialize(NullOutputStream.INSTANCE);
}
}
