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 e589325  Use StandardCharsets instead of magic string
e589325 is described below

commit e589325c3ace97b0830970c91275a24b5b0db1e4
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Dec 15 16:05:36 2023 -0500

    Use StandardCharsets instead of magic string
---
 src/main/java/org/apache/commons/mail/EmailConstants.java  | 7 ++++---
 src/test/java/org/apache/commons/mail/SimpleEmailTest.java | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/commons/mail/EmailConstants.java 
b/src/main/java/org/apache/commons/mail/EmailConstants.java
index ac219ba..c12dd49 100644
--- a/src/main/java/org/apache/commons/mail/EmailConstants.java
+++ b/src/main/java/org/apache/commons/mail/EmailConstants.java
@@ -16,6 +16,7 @@
  */
 package org.apache.commons.mail;
 
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 
 /**
@@ -70,13 +71,13 @@ public final class EmailConstants {
     public static final String KOI8_R = "koi8-r";
 
     /** Charset constant for iso-8859-1 */
-    public static final String ISO_8859_1 = "iso-8859-1";
+    public static final String ISO_8859_1 = StandardCharsets.ISO_8859_1.name();
 
     /** Charset constant for us-ascii */
-    public static final String US_ASCII = "us-ascii";
+    public static final String US_ASCII = StandardCharsets.US_ASCII.name();
 
     /** Charset constant for utf-8 */
-    public static final String UTF_8 = "utf-8";
+    public static final String UTF_8 = StandardCharsets.UTF_8.name();
 
     /** The debug mode to be used. */
     public static final String MAIL_DEBUG = "mail.debug";
diff --git a/src/test/java/org/apache/commons/mail/SimpleEmailTest.java 
b/src/test/java/org/apache/commons/mail/SimpleEmailTest.java
index 449a5de..e1a8852 100644
--- a/src/test/java/org/apache/commons/mail/SimpleEmailTest.java
+++ b/src/test/java/org/apache/commons/mail/SimpleEmailTest.java
@@ -21,6 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 
 import org.apache.commons.mail.mocks.MockSimpleEmail;
 import org.junit.jupiter.api.BeforeEach;
@@ -48,7 +49,7 @@ public class SimpleEmailTest extends AbstractEmailTest {
          * disabling this test as it is dependent on execution order. 
MimeUtility.getDefaultMIMECharset does some internal caching and if 
mail.mime.charset is
          * not defined, reverts to the default Java charset which is basically 
the system default file encoding.
          */
-        System.setProperty(EmailConstants.MAIL_MIME_CHARSET, "utf-8");
+        System.setProperty(EmailConstants.MAIL_MIME_CHARSET, 
StandardCharsets.UTF_8.name());
         // Test Success
         getMailServer();
 

Reply via email to