[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 f27518b  Use a JRE built-in Charset instead of a magic string
f27518b is described below

commit f27518b7a7b5a9ac51c7a25f43784a846a399e79
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Jul 16 08:09:13 2023 -0400

    Use a JRE built-in Charset instead of a magic string
---
 src/main/java/org/apache/commons/mail/EmailUtils.java     | 12 +++---------
 src/main/java/org/apache/commons/mail/HtmlEmail.java      |  3 +--
 src/test/java/org/apache/commons/mail/EmailUtilsTest.java |  4 +---
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/apache/commons/mail/EmailUtils.java 
b/src/main/java/org/apache/commons/mail/EmailUtils.java
index a9fb1fe..10fb3cb 100644
--- a/src/main/java/org/apache/commons/mail/EmailUtils.java
+++ b/src/main/java/org/apache/commons/mail/EmailUtils.java
@@ -19,7 +19,7 @@ package org.apache.commons.mail;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.BitSet;
 import java.util.Random;
 
@@ -50,11 +50,6 @@ final class EmailUtils
      */
     private static final Random RANDOM = new Random();
 
-    /**
-     * The default charset used for URL encoding.
-     */
-    private static final String US_ASCII = "US-ASCII";
-
     /**
      * Radix used in encoding.
      */
@@ -281,10 +276,9 @@ final class EmailUtils
      *
      * @param input the input string to be URL encoded
      * @return a URL encoded string
-     * @throws UnsupportedEncodingException if "US-ASCII" charset is not 
available
      * @see <a href="http://tools.ietf.org/html/rfc2392";>RFC 2392</a>
      */
-    static String encodeUrl(final String input) throws 
UnsupportedEncodingException
+    static String encodeUrl(final String input)
     {
         if (input == null)
         {
@@ -292,7 +286,7 @@ final class EmailUtils
         }
 
         final StringBuilder builder = new StringBuilder();
-        for (final byte c : input.getBytes(US_ASCII))
+        for (final byte c : input.getBytes(StandardCharsets.US_ASCII))
         {
             int b = c;
             if (b < 0)
diff --git a/src/main/java/org/apache/commons/mail/HtmlEmail.java 
b/src/main/java/org/apache/commons/mail/HtmlEmail.java
index 98fdffd..dcac143 100644
--- a/src/main/java/org/apache/commons/mail/HtmlEmail.java
+++ b/src/main/java/org/apache/commons/mail/HtmlEmail.java
@@ -19,7 +19,6 @@ package org.apache.commons.mail;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
@@ -482,7 +481,7 @@ public class HtmlEmail extends MultiPartEmail
 
             return encodedCid;
         }
-        catch (final MessagingException | UnsupportedEncodingException uee)
+        catch (final MessagingException uee)
         {
             throw new EmailException(uee);
         }
diff --git a/src/test/java/org/apache/commons/mail/EmailUtilsTest.java 
b/src/test/java/org/apache/commons/mail/EmailUtilsTest.java
index 15fd0fb..4df79fd 100644
--- a/src/test/java/org/apache/commons/mail/EmailUtilsTest.java
+++ b/src/test/java/org/apache/commons/mail/EmailUtilsTest.java
@@ -19,8 +19,6 @@ package org.apache.commons.mail;
 
 import static org.junit.Assert.assertEquals;
 
-import java.io.UnsupportedEncodingException;
-
 import org.junit.Test;
 
 /**
@@ -43,7 +41,7 @@ public class EmailUtilsTest {
     }
 
     @Test
-    public void testUrlEncoding() throws UnsupportedEncodingException {
+    public void testUrlEncoding() {
         assertEquals("abcdefg", EmailUtils.encodeUrl("abcdefg"));
         assertEquals("0123456789", EmailUtils.encodeUrl("0123456789"));
         assertEquals("Test%20CID", EmailUtils.encodeUrl("Test CID"));