Use StandardCharsets instead of magic string

apache · Dec 15, 2023 · e589325 · e589325
1 parent 8264a18
commit e589325
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -21,6 +21,7 @@
 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 void testDefaultMimeCharset() throws EmailException, IOException {
          * 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();