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 7bcd361c3 Make use of StandardCharsets
7bcd361c3 is described below
commit 7bcd361c36cf3147811525276262811dcf33f9e8
Author: Andreas Veithen <[email protected]>
AuthorDate: Tue Jun 6 23:27:57 2023 +0000
Make use of StandardCharsets
---
.../test/java/org/apache/axiom/util/base64/Base64UtilsTest.java | 3 ++-
.../apache/axiom/util/stax/dialect/TestGetEncodingExternal.java | 3 ++-
.../java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSourceTest.java | 6 ++++--
.../src/test/java/org/apache/axiom/util/jaxb/JAXBUtilsTest.java | 4 +++-
.../test/java/org/apache/axiom/attachments/AttachmentsTest.java | 3 ++-
.../org/apache/axiom/core/stream/serializer/SerializerTest.java | 5 +++--
.../core/stream/serializer/writer/OutputStreamXmlWriterTest.java | 4 ++--
.../src/main/java/org/apache/axiom/core/NodeFactoryImpl.java | 3 ++-
.../axiom/om/impl/common/factory/meta/DetachableReader.java | 8 +++-----
.../apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java | 3 ++-
.../org/apache/axiom/soap/impl/llom/CharacterEncoding2Test.java | 7 ++++---
.../org/apache/axiom/ts/om/builder/TestIOExceptionInGetText.java | 4 +++-
.../java/org/apache/axiom/ts/om/document/TestSerializeUTF16.java | 3 ++-
.../ts/om/document/TestSerializeWithIgnoreXMLDeclaration.java | 3 ++-
.../java/org/apache/axiom/ts/om/document/TestSerializeXML11.java | 3 ++-
.../apache/axiom/ts/om/document/TestSerializeXMLDeclaration.java | 3 ++-
.../apache/axiom/ts/om/document/sr/TestCloseWithoutCaching.java | 3 ++-
.../axiom/ts/om/element/TestGetTextAsStreamWithoutCaching.java | 3 ++-
.../java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java | 6 +++---
.../TestGetTextAsStreamWithNonDestructiveOMDataSource.java | 3 ++-
.../TestSerializeModifiedOMSEWithNonDestructiveDataSource.java | 3 ++-
.../TestWriteTextToWithNonDestructiveOMDataSource.java | 6 +++---
.../axiom/ts/om/text/TestGetTextCharactersFromDataHandler.java | 4 +++-
23 files changed, 57 insertions(+), 36 deletions(-)
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/base64/Base64UtilsTest.java
b/axiom-api/src/test/java/org/apache/axiom/util/base64/Base64UtilsTest.java
index 5ab4d15dd..4b750de9b 100644
--- a/axiom-api/src/test/java/org/apache/axiom/util/base64/Base64UtilsTest.java
+++ b/axiom-api/src/test/java/org/apache/axiom/util/base64/Base64UtilsTest.java
@@ -22,6 +22,7 @@ package org.apache.axiom.util.base64;
import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assert.assertThrows;
+import java.nio.charset.StandardCharsets;
import java.util.Random;
import junit.framework.TestCase;
@@ -53,7 +54,7 @@ public class Base64UtilsTest extends TestCase {
public void testSpace() throws Exception{
assertEquals(
"any carnal pleasure.",
- new String(Base64Utils.decode(" YW55IG\tNhcm5hbC\r\nBwb
GVhc3VyZS4 = "), "utf-8"));
+ new String(Base64Utils.decode(" YW55IG\tNhcm5hbC\r\nBwb
GVhc3VyZS4 = "), StandardCharsets.UTF_8));
}
public void testInvalidCharacter() {
diff --git
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingExternal.java
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingExternal.java
index 68c42eb9f..c3dd79f19 100644
---
a/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingExternal.java
+++
b/axiom-api/src/test/java/org/apache/axiom/util/stax/dialect/TestGetEncodingExternal.java
@@ -19,6 +19,7 @@
package org.apache.axiom.util.stax.dialect;
import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamReader;
@@ -36,7 +37,7 @@ public class TestGetEncodingExternal extends DialectTestCase {
protected void runTest() throws Throwable {
XMLInputFactory factory = staxImpl.newNormalizedXMLInputFactory();
XMLStreamReader reader = factory.createXMLStreamReader(new
ByteArrayInputStream(
- "<root/>".getBytes("ISO-8859-1")), "ISO-8859-1");
+ "<root/>".getBytes(StandardCharsets.ISO_8859_1)),
"ISO-8859-1");
assertEquals("ISO-8859-1", reader.getEncoding());
}
}
diff --git
a/axiom-jaxb/src/test/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSourceTest.java
b/axiom-jaxb/src/test/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSourceTest.java
index 746e73266..2638b53eb 100644
---
a/axiom-jaxb/src/test/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSourceTest.java
+++
b/axiom-jaxb/src/test/java/org/apache/axiom/om/ds/jaxb/JAXBOMDataSourceTest.java
@@ -24,6 +24,7 @@ import static org.assertj.core.api.Assertions.fail;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
+import java.nio.charset.StandardCharsets;
import javax.activation.DataHandler;
import javax.xml.bind.JAXBContext;
@@ -122,7 +123,8 @@ public class JAXBOMDataSourceTest {
assertThat(content.isBinary()).isTrue();
assertThat(content.isOptimized()).isTrue();
Blob blob = content.getBlob();
- assertThat(IOUtils.toString(blob.getInputStream(),
"utf-8")).isEqualTo("some content");
+ assertThat(IOUtils.toString(blob.getInputStream(),
StandardCharsets.UTF_8))
+ .isEqualTo("some content");
}
/**
@@ -159,7 +161,7 @@ public class JAXBOMDataSourceTest {
envelope.getBody()
.getFirstElement()
.getXMLStreamReader(false));
- assertThat(IOUtils.toString(object.getContent().getInputStream(),
"utf-8"))
+ assertThat(IOUtils.toString(object.getContent().getInputStream(),
StandardCharsets.UTF_8))
.isEqualTo("some content");
}
diff --git
a/axiom-jaxb/src/test/java/org/apache/axiom/util/jaxb/JAXBUtilsTest.java
b/axiom-jaxb/src/test/java/org/apache/axiom/util/jaxb/JAXBUtilsTest.java
index a85125226..9a7569c0a 100644
--- a/axiom-jaxb/src/test/java/org/apache/axiom/util/jaxb/JAXBUtilsTest.java
+++ b/axiom-jaxb/src/test/java/org/apache/axiom/util/jaxb/JAXBUtilsTest.java
@@ -20,6 +20,8 @@ package org.apache.axiom.util.jaxb;
import static org.assertj.core.api.Assertions.assertThat;
+import java.nio.charset.StandardCharsets;
+
import javax.activation.DataHandler;
import javax.xml.bind.JAXBContext;
import javax.xml.bind.JAXBElement;
@@ -67,7 +69,7 @@ public class JAXBUtilsTest {
JAXBContext context = JAXBContext.newInstance(DocumentBean2.class);
DocumentBean2 bean = (DocumentBean2) JAXBUtils.unmarshal(element,
context, null, true);
assertThat(bean.getId()).isEqualTo("12345");
- assertThat(bean.getContent()).isEqualTo("test
content".getBytes("utf-8"));
+ assertThat(bean.getContent()).isEqualTo("test
content".getBytes(StandardCharsets.UTF_8));
}
@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 dbf4e816a..ce6b6eadb 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
@@ -31,6 +31,7 @@ import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
+import java.nio.charset.StandardCharsets;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
@@ -547,7 +548,7 @@ public class AttachmentsTest extends AbstractTestCase {
true, getAttachmentsDir(), "1");
DataHandler dh =
attachments.getDataHandler("__WLS__1188904239162__SOAP__");
- BufferedReader reader = new BufferedReader(new
InputStreamReader(dh.getInputStream(), "UTF-8"));
+ BufferedReader reader = new BufferedReader(new
InputStreamReader(dh.getInputStream(), StandardCharsets.UTF_8));
assertEquals("%PDF-1.3", reader.readLine());
reader.close();
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 60a1198c8..7920e5e60 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
@@ -22,6 +22,7 @@ import static com.google.common.truth.Truth.assertThat;
import java.io.ByteArrayOutputStream;
import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
import org.apache.axiom.core.stream.StreamException;
import org.apache.commons.io.output.NullOutputStream;
@@ -88,7 +89,7 @@ public class SerializerTest {
handler.attributesCompleted();
handler.endElement();
handler.completed();
- assertThat(new String(baos.toByteArray(), "ascii"))
+ assertThat(new String(baos.toByteArray(), StandardCharsets.US_ASCII))
.isEqualTo("<test attr=\"néant\"/>");
}
@@ -107,7 +108,7 @@ public class SerializerTest {
handler.attributesCompleted();
handler.endElement();
handler.completed();
- assertThat(new String(baos.toByteArray(), "ascii"))
+ assertThat(new String(baos.toByteArray(), StandardCharsets.US_ASCII))
.isEqualTo("<x y=\"𣎴 - 𠘨\"/>");
}
diff --git
a/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/writer/OutputStreamXmlWriterTest.java
b/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/writer/OutputStreamXmlWriterTest.java
index 1291b281c..7ad7dce0a 100644
---
a/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/writer/OutputStreamXmlWriterTest.java
+++
b/components/core-streams/src/test/java/org/apache/axiom/core/stream/serializer/writer/OutputStreamXmlWriterTest.java
@@ -21,7 +21,7 @@ package org.apache.axiom.core.stream.serializer.writer;
import static com.google.common.truth.Truth.assertThat;
import java.io.ByteArrayOutputStream;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import org.junit.Test;
@@ -29,7 +29,7 @@ public class OutputStreamXmlWriterTest {
@Test
public void testUnmappableCharacterToCharacterReference() throws Exception
{
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- XmlWriter writer = new OutputStreamXmlWriter(baos,
Charset.forName("iso-8859-1"));
+ XmlWriter writer = new OutputStreamXmlWriter(baos,
StandardCharsets.ISO_8859_1);
writer.setUnmappableCharacterHandler(
UnmappableCharacterHandler.CONVERT_TO_CHARACTER_REFERENCE);
writer.write("abc\u20ACdef");
diff --git
a/mixins/core-mixins/src/main/java/org/apache/axiom/core/NodeFactoryImpl.java
b/mixins/core-mixins/src/main/java/org/apache/axiom/core/NodeFactoryImpl.java
index 63497642d..bc18eac59 100644
---
a/mixins/core-mixins/src/main/java/org/apache/axiom/core/NodeFactoryImpl.java
+++
b/mixins/core-mixins/src/main/java/org/apache/axiom/core/NodeFactoryImpl.java
@@ -23,6 +23,7 @@ import java.io.IOException;
import java.io.InputStreamReader;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -53,7 +54,7 @@ public abstract class NodeFactoryImpl implements NodeFactory {
new InputStreamReader(
cl.getResourceAsStream(
pkg.replace('.', '/') +
"/nodetypes.index"),
- "UTF-8"));
+ StandardCharsets.UTF_8));
try {
String line;
while ((line = in.readLine()) != null) {
diff --git
a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/DetachableReader.java
b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/DetachableReader.java
index 33a79ae9c..9d9a92d85 100644
---
a/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/DetachableReader.java
+++
b/mixins/om-mixins/src/main/java/org/apache/axiom/om/impl/common/factory/meta/DetachableReader.java
@@ -24,7 +24,7 @@ import java.io.OutputStreamWriter;
import java.io.Reader;
import java.io.Writer;
import java.nio.CharBuffer;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import org.apache.axiom.blob.Blobs;
import org.apache.axiom.blob.MemoryBlob;
@@ -32,8 +32,6 @@ import org.apache.axiom.om.OMException;
import org.apache.axiom.om.impl.common.builder.Detachable;
final class DetachableReader extends Reader implements Detachable {
- private static final Charset UTF8 = Charset.forName("UTF-8");
-
private Reader target;
DetachableReader(Reader target) {
@@ -78,7 +76,7 @@ final class DetachableReader extends Reader implements
Detachable {
@Override
public void detach() {
MemoryBlob blob = Blobs.createMemoryBlob();
- Writer out = new OutputStreamWriter(blob.getOutputStream(), UTF8);
+ Writer out = new OutputStreamWriter(blob.getOutputStream(),
StandardCharsets.UTF_8);
char[] buffer = new char[2048];
int c;
try {
@@ -89,6 +87,6 @@ final class DetachableReader extends Reader implements
Detachable {
} catch (IOException ex) {
throw new OMException(ex);
}
- target = new InputStreamReader(blob.readOnce(), UTF8);
+ target = new InputStreamReader(blob.readOnce(),
StandardCharsets.UTF_8);
}
}
diff --git
a/systests/old-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java
b/systests/old-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java
index a127c682c..88583de94 100644
---
a/systests/old-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java
+++
b/systests/old-tests/src/test/java/org/apache/axiom/om/impl/mtom/MTOMStAXSOAPModelBuilderTest.java
@@ -34,6 +34,7 @@ import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -230,7 +231,7 @@ public class MTOMStAXSOAPModelBuilderTest extends TestCase {
"Foo Bar\r\n" +
"------=_AxIs2_Def_boundary_=42214532--\r\n";
byte[] bytes1 = xmlPlusMime1.getBytes();
- byte[] bytes2 = xmlPlusMime2.getBytes("UTF-16");
+ byte[] bytes2 = xmlPlusMime2.getBytes(StandardCharsets.UTF_16);
byte[] bytes3 = xmlPlusMime3.getBytes();
byte[] full = append(bytes1, bytes2);
full = append(full, bytes3);
diff --git
a/systests/old-tests/src/test/java/org/apache/axiom/soap/impl/llom/CharacterEncoding2Test.java
b/systests/old-tests/src/test/java/org/apache/axiom/soap/impl/llom/CharacterEncoding2Test.java
index aa798a835..2e782cb73 100644
---
a/systests/old-tests/src/test/java/org/apache/axiom/soap/impl/llom/CharacterEncoding2Test.java
+++
b/systests/old-tests/src/test/java/org/apache/axiom/soap/impl/llom/CharacterEncoding2Test.java
@@ -30,6 +30,7 @@ import org.apache.axiom.om.OMXMLBuilderFactory;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
import junit.framework.TestCase;
@@ -51,7 +52,7 @@ public class CharacterEncoding2Test extends TestCase {
"</soap:Envelope>";
public void testISO99591() throws Exception {
- ByteArrayInputStream byteInStr = new
ByteArrayInputStream(xml.getBytes("iso-8859-1"));
+ ByteArrayInputStream byteInStr = new
ByteArrayInputStream(xml.getBytes(StandardCharsets.ISO_8859_1));
SOAPModelBuilder builder = OMXMLBuilderFactory.createSOAPModelBuilder(
byteInStr, null);
@@ -67,8 +68,8 @@ public class CharacterEncoding2Test extends TestCase {
envelope.serialize(byteOutStr, outputFormat);
assertAbout(xml())
- .that(new InputStreamReader(new
ByteArrayInputStream(byteOutStr.toByteArray()),"iso-8859-1"))
- .hasSameContentAs(new InputStreamReader(new
ByteArrayInputStream(xml.getBytes("iso-8859-1")),"iso-8859-1"));
+ .that(new InputStreamReader(new
ByteArrayInputStream(byteOutStr.toByteArray()), StandardCharsets.ISO_8859_1))
+ .hasSameContentAs(new InputStreamReader(new
ByteArrayInputStream(xml.getBytes(StandardCharsets.ISO_8859_1)),
StandardCharsets.ISO_8859_1));
builder.close();
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestIOExceptionInGetText.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestIOExceptionInGetText.java
index 9ad4b26b2..137283dbe 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestIOExceptionInGetText.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/builder/TestIOExceptionInGetText.java
@@ -20,6 +20,7 @@ package org.apache.axiom.ts.om.builder;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
import javax.xml.stream.XMLStreamReader;
@@ -55,7 +56,8 @@ public class TestIOExceptionInGetText extends AxiomTestCase {
}
InputStream in =
new ExceptionInputStream(
- new
ByteArrayInputStream(xml.toString().getBytes("ASCII")));
+ new ByteArrayInputStream(
+
xml.toString().getBytes(StandardCharsets.US_ASCII)));
XMLStreamReader originalReader = StAXUtils.createXMLStreamReader(in);
InvocationCounter invocationCounter = new InvocationCounter();
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeUTF16.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeUTF16.java
index c24ef7958..98cc81db5 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeUTF16.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeUTF16.java
@@ -21,6 +21,7 @@ package org.apache.axiom.ts.om.document;
import static com.google.common.truth.Truth.assertThat;
import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMMetaFactory;
@@ -38,7 +39,7 @@ public class TestSerializeUTF16 extends
XMLDeclarationSerializationTestCase {
format.setCharSetEncoding("UTF-16");
document.serializeAndConsume(baos, format);
- String xmlDocument = new String(baos.toByteArray(), "UTF-16");
+ String xmlDocument = new String(baos.toByteArray(),
StandardCharsets.UTF_16);
assertThat(xmlDocument).startsWith("<?xml version=\"1.0\"
encoding=\"UTF-16\"?>");
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeWithIgnoreXMLDeclaration.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeWithIgnoreXMLDeclaration.java
index 44b4a5a83..e85af09fd 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeWithIgnoreXMLDeclaration.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeWithIgnoreXMLDeclaration.java
@@ -21,6 +21,7 @@ package org.apache.axiom.ts.om.document;
import static com.google.common.truth.Truth.assertThat;
import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMMetaFactory;
@@ -38,7 +39,7 @@ public class TestSerializeWithIgnoreXMLDeclaration extends
XMLDeclarationSeriali
format.setIgnoreXMLDeclaration(true);
document.serializeAndConsume(baos, format);
- String xmlDocument = new String(baos.toByteArray(), "utf-8");
+ String xmlDocument = new String(baos.toByteArray(),
StandardCharsets.UTF_8);
assertThat(xmlDocument).doesNotContain("<?xml");
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeXML11.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeXML11.java
index 4a4a77450..4c5dc2256 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeXML11.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeXML11.java
@@ -21,6 +21,7 @@ package org.apache.axiom.ts.om.document;
import static com.google.common.truth.Truth.assertThat;
import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMMetaFactory;
@@ -36,7 +37,7 @@ public class TestSerializeXML11 extends
XMLDeclarationSerializationTestCase {
document.setXMLVersion("1.1");
document.serializeAndConsume(baos);
- String xmlDocument = new String(baos.toByteArray(), "utf-8");
+ String xmlDocument = new String(baos.toByteArray(),
StandardCharsets.UTF_8);
assertThat(xmlDocument).startsWith("<?xml version=\"1.1\"");
}
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeXMLDeclaration.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeXMLDeclaration.java
index f3459c55e..49c35c5eb 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeXMLDeclaration.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/TestSerializeXMLDeclaration.java
@@ -21,6 +21,7 @@ package org.apache.axiom.ts.om.document;
import static com.google.common.truth.Truth.assertThat;
import java.io.ByteArrayOutputStream;
+import java.nio.charset.StandardCharsets;
import org.apache.axiom.om.OMDocument;
import org.apache.axiom.om.OMMetaFactory;
@@ -35,7 +36,7 @@ public class TestSerializeXMLDeclaration extends
XMLDeclarationSerializationTest
ByteArrayOutputStream baos = new ByteArrayOutputStream();
document.serializeAndConsume(baos);
- String xmlDocument = new String(baos.toByteArray(), "utf-8");
+ String xmlDocument = new String(baos.toByteArray(),
StandardCharsets.UTF_8);
assertThat(xmlDocument).startsWith("<?xml version=\"1.0\"
encoding=\"utf-8\"?>");
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestCloseWithoutCaching.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestCloseWithoutCaching.java
index 344acc057..659f81cbe 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestCloseWithoutCaching.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/document/sr/TestCloseWithoutCaching.java
@@ -22,6 +22,7 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.OutputStreamWriter;
import java.io.Writer;
+import java.nio.charset.StandardCharsets;
import javax.xml.stream.XMLStreamReader;
@@ -46,7 +47,7 @@ public class TestCloseWithoutCaching extends AxiomTestCase {
@Override
protected void runTest() throws Throwable {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
- Writer writer = new OutputStreamWriter(baos, "UTF-8");
+ Writer writer = new OutputStreamWriter(baos, StandardCharsets.UTF_8);
writer.write("<root><a>");
for (int i = 0; i < 20000; i++) {
writer.write('a');
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsStreamWithoutCaching.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsStreamWithoutCaching.java
index 603693823..a108b1992 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsStreamWithoutCaching.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/element/TestGetTextAsStreamWithoutCaching.java
@@ -26,6 +26,7 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.io.SequenceInputStream;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import java.util.Vector;
import org.apache.axiom.blob.Blob;
@@ -45,7 +46,7 @@ public class TestGetTextAsStreamWithoutCaching extends
AxiomTestCase {
@Override
protected void runTest() throws Throwable {
- Charset charset = Charset.forName("ascii");
+ Charset charset = StandardCharsets.US_ASCII;
OMFactory factory = metaFactory.getOMFactory();
Blob blob = new RandomBlob(654321, 64, 128, 20000000);
Vector<InputStream> v = new Vector<InputStream>();
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java
index 101882d56..87f70d1dd 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetObject.java
@@ -18,7 +18,7 @@
*/
package org.apache.axiom.ts.om.sourcedelement;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import javax.xml.namespace.QName;
@@ -40,11 +40,11 @@ public class TestGetObject extends AxiomTestCase {
@Override
protected void runTest() throws Throwable {
OMFactory factory = metaFactory.getOMFactory();
- Blob blob = Blobs.createBlob("test".getBytes("utf-8"));
+ Blob blob = Blobs.createBlob("test".getBytes(StandardCharsets.UTF_8));
OMSourcedElement element =
factory.createOMElement(
new WrappedTextNodeOMDataSourceFromBlob(
- new QName("wrapper"), blob,
Charset.forName("utf-8")));
+ new QName("wrapper"), blob,
StandardCharsets.UTF_8));
// getObject returns null if the data source is not of the expected
type
assertNull(element.getObject(StringOMDataSource.class));
// Test with the right data source type
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetTextAsStreamWithNonDestructiveOMDataSource.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetTextAsStreamWithNonDestructiveOMDataSource.java
index c43a9e811..4841a241d 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetTextAsStreamWithNonDestructiveOMDataSource.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestGetTextAsStreamWithNonDestructiveOMDataSource.java
@@ -22,6 +22,7 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.io.StringReader;
import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import javax.xml.namespace.QName;
@@ -44,7 +45,7 @@ public class
TestGetTextAsStreamWithNonDestructiveOMDataSource extends AxiomTest
OMFactory factory = metaFactory.getOMFactory();
Blob blob = new RandomBlob(445566, 32, 128, 20000000);
QName qname = new QName("a");
- Charset cs = Charset.forName("ascii");
+ Charset cs = StandardCharsets.US_ASCII;
OMSourcedElement element =
factory.createOMElement(
new WrappedTextNodeOMDataSourceFromBlob(qname, blob,
cs), qname);
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeModifiedOMSEWithNonDestructiveDataSource.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeModifiedOMSEWithNonDestructiveDataSource.java
index 3927b484a..b1e763366 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeModifiedOMSEWithNonDestructiveDataSource.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestSerializeModifiedOMSEWithNonDestructiveDataSource.java
@@ -20,6 +20,7 @@ package org.apache.axiom.ts.om.sourcedelement;
import java.io.ByteArrayOutputStream;
import java.io.StringWriter;
+import java.nio.charset.StandardCharsets;
import org.apache.axiom.om.OMDataSourceExt;
import org.apache.axiom.om.OMElement;
@@ -49,7 +50,7 @@ public class
TestSerializeModifiedOMSEWithNonDestructiveDataSource extends Axiom
ByteArrayOutputStream baos = new ByteArrayOutputStream();
element.serialize(baos);
- assertTrue(new String(baos.toByteArray(), "UTF-8").indexOf("TEST") !=
-1);
+ assertTrue(new String(baos.toByteArray(),
StandardCharsets.UTF_8).indexOf("TEST") != -1);
assertTrue(element.toString().indexOf("TEST") != -1);
}
diff --git
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestWriteTextToWithNonDestructiveOMDataSource.java
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestWriteTextToWithNonDestructiveOMDataSource.java
index ea43b67c1..32a3d72b2 100644
---
a/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestWriteTextToWithNonDestructiveOMDataSource.java
+++
b/testing/axiom-testsuite/src/main/java/org/apache/axiom/ts/om/sourcedelement/TestWriteTextToWithNonDestructiveOMDataSource.java
@@ -21,7 +21,7 @@ package org.apache.axiom.ts.om.sourcedelement;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.Writer;
-import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
import javax.xml.namespace.QName;
@@ -47,9 +47,9 @@ public class TestWriteTextToWithNonDestructiveOMDataSource
extends AxiomTestCase
OMSourcedElement element =
factory.createOMElement(
new WrappedTextNodeOMDataSourceFromBlob(
- qname, blob, Charset.forName("ascii")),
+ qname, blob, StandardCharsets.US_ASCII),
qname);
- Reader in = new InputStreamReader(blob.getInputStream(), "ascii");
+ Reader in = new InputStreamReader(blob.getInputStream(),
StandardCharsets.US_ASCII);
Writer out = new CharacterStreamComparator(in);
element.writeTextTo(out, true); // cache doesn't matter here
out.close();
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 7f95ae125..b3cf4894a 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
@@ -18,6 +18,8 @@
*/
package org.apache.axiom.ts.om.text;
+import java.nio.charset.StandardCharsets;
+
import javax.activation.DataHandler;
import org.apache.axiom.om.OMMetaFactory;
@@ -43,6 +45,6 @@ public class TestGetTextCharactersFromDataHandler extends
AxiomTestCase {
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"));
+ assertEquals("test content", new String(decoded,
StandardCharsets.UTF_8));
}
}
