[commons-fileupload] branch master updated: FILEUPLOAD-312 - Use charset constant

[jochen]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 149d38d  FILEUPLOAD-312 - Use charset constant
     new 5b4060f  Merge pull request #64 from 
arturobernalg/feature/FILEUPLOAD-312
149d38d is described below

commit 149d38d7c1ff0e9f934774c7ad29eba0667d0d8a
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Fri Apr 23 07:02:51 2021 +0200

    FILEUPLOAD-312 - Use charset constant
---
 src/main/java/org/apache/commons/fileupload2/FileUploadBase.java  | 8 ++------
 .../org/apache/commons/fileupload2/util/mime/MimeUtility.java     | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java 
b/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
index ef93788..53682a9 100644
--- a/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
+++ b/src/main/java/org/apache/commons/fileupload2/FileUploadBase.java
@@ -19,7 +19,7 @@ package org.apache.commons.fileupload2;
 import static java.lang.String.format;
 
 import java.io.IOException;
-import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -423,11 +423,7 @@ public abstract class FileUploadBase {
             return null;
         }
         byte[] boundary;
-        try {
-            boundary = boundaryStr.getBytes("ISO-8859-1");
-        } catch (final UnsupportedEncodingException e) {
-            boundary = boundaryStr.getBytes(); // Intentionally falls back to 
default charset
-        }
+        boundary = boundaryStr.getBytes(StandardCharsets.ISO_8859_1);
         return boundary;
     }
 
diff --git 
a/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java 
b/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
index af0f06b..5a0d322 100644
--- a/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
+++ b/src/main/java/org/apache/commons/fileupload2/util/mime/MimeUtility.java
@@ -19,6 +19,7 @@ package org.apache.commons.fileupload2.util.mime;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
+import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -31,11 +32,6 @@ import java.util.Map;
 public final class MimeUtility {
 
     /**
-     * The {@code US-ASCII} charset identifier constant.
-     */
-    private static final String US_ASCII_CHARSET = "US-ASCII";
-
-    /**
      * The marker to indicate text is encoded with BASE64 algorithm.
      */
     private static final String BASE64_ENCODING_MARKER = "B";
@@ -237,7 +233,7 @@ public final class MimeUtility {
             // the decoder writes directly to an output stream.
             final ByteArrayOutputStream out = new 
ByteArrayOutputStream(encodedText.length());
 
-            final byte[] encodedData = encodedText.getBytes(US_ASCII_CHARSET);
+            final byte[] encodedData = 
encodedText.getBytes(StandardCharsets.US_ASCII);
 
             // Base64 encoded?
             if (encoding.equals(BASE64_ENCODING_MARKER)) {