[commons-email] branch master updated: Use a JRE built-in Charset instead of a magic string

[ggregory]

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

ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-email.git


The following commit(s) were added to refs/heads/master by this push:
     new b70b6c3  Use a JRE built-in Charset instead of a magic string
b70b6c3 is described below

commit b70b6c3ebad5f8a6c81d31463c1202475e65eebf
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Jul 16 08:11:27 2023 -0400

    Use a JRE built-in Charset instead of a magic string
---
 src/main/java/org/apache/commons/mail/ByteArrayDataSource.java | 3 ++-
 src/test/java/org/apache/commons/mail/EmailLiveTest.java       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/commons/mail/ByteArrayDataSource.java 
b/src/main/java/org/apache/commons/mail/ByteArrayDataSource.java
index e489abb..c33d8c1 100644
--- a/src/main/java/org/apache/commons/mail/ByteArrayDataSource.java
+++ b/src/main/java/org/apache/commons/mail/ByteArrayDataSource.java
@@ -24,6 +24,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 
 import javax.activation.DataSource;
 
@@ -110,7 +111,7 @@ public class ByteArrayDataSource implements DataSource
 
             // Assumption that the string contains only ASCII characters!
             // Else just pass in a charset into this constructor and use it in 
getBytes().
-            baos.write(data.getBytes("iso-8859-1"));
+            baos.write(data.getBytes(StandardCharsets.ISO_8859_1));
             baos.flush();
             baos.close();
         }
diff --git a/src/test/java/org/apache/commons/mail/EmailLiveTest.java 
b/src/test/java/org/apache/commons/mail/EmailLiveTest.java
index ed68573..f26d499 100644
--- a/src/test/java/org/apache/commons/mail/EmailLiveTest.java
+++ b/src/test/java/org/apache/commons/mail/EmailLiveTest.java
@@ -19,6 +19,7 @@ package org.apache.commons.mail;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.net.URL;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -263,7 +264,7 @@ public class EmailLiveTest extends AbstractEmailTest
         email.setMsg(textMsg);
 
         // create a proper UTF-8 sequence for the text attachment (matching 
our default charset)
-        final DataSource attachment = new 
javax.mail.util.ByteArrayDataSource(textMsg.getBytes("utf-8"), "text/plain");
+        final DataSource attachment = new 
javax.mail.util.ByteArrayDataSource(textMsg.getBytes(StandardCharsets.UTF_8), 
"text/plain");
         email.attach(attachment, attachmentName, "Attachment in Greek");
 
         EmailUtils.writeMimeMessage( new 
File("./target/test-emails/correct-encoding.eml"), 
send(email).getMimeMessage());