You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2023/06/06 14:29:14 UTC
[commons-fileupload] 02/09: Rename some internal classes
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-fileupload.git
commit 1ac17bb4a1b6b8926fe8c33857be995d56af8940
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Tue Jun 6 08:42:34 2023 -0400
Rename some internal classes
---
.../fileupload2/{MimeUtility.java => MimeUtils.java} | 4 ++--
.../apache/commons/fileupload2/ParameterParser.java | 4 ++--
.../{RFC2231Utility.java => RFC2231Utils.java} | 4 ++--
.../commons/fileupload2/MimeUtilityTestCase.java | 6 +++---
.../commons/fileupload2/RFC2231UtilityTestCase.java | 20 ++++++++++----------
5 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MimeUtility.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MimeUtils.java
similarity index 99%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MimeUtility.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MimeUtils.java
index 856dbbb..33f9c61 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MimeUtility.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/MimeUtils.java
@@ -28,7 +28,7 @@ import java.util.Map;
/**
* Utility class to decode MIME texts.
*/
-final class MimeUtility {
+final class MimeUtils {
/**
* The marker to indicate text is encoded with BASE64 algorithm.
@@ -265,7 +265,7 @@ final class MimeUtility {
/**
* Hidden constructor, this class must not be instantiated.
*/
- private MimeUtility() {
+ private MimeUtils() {
// do nothing
}
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/ParameterParser.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/ParameterParser.java
index f832b1b..ad6d804 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/ParameterParser.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/ParameterParser.java
@@ -176,7 +176,7 @@ public class ParameterParser {
if (paramValue != null) {
try {
- paramValue = RFC2231Utility.hasEncodedValue(paramName) ? RFC2231Utility.decodeText(paramValue) : MimeUtility.decodeText(paramValue);
+ paramValue = RFC2231Utils.hasEncodedValue(paramName) ? RFC2231Utils.decodeText(paramValue) : MimeUtils.decodeText(paramValue);
} catch (final UnsupportedEncodingException ignored) {
// let's keep the original value in this case
}
@@ -186,7 +186,7 @@ public class ParameterParser {
pos++; // skip separator
}
if (paramName != null && !paramName.isEmpty()) {
- paramName = RFC2231Utility.stripDelimiter(paramName);
+ paramName = RFC2231Utils.stripDelimiter(paramName);
if (this.lowerCaseNames) {
paramName = paramName.toLowerCase(Locale.ENGLISH);
}
diff --git a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/RFC2231Utility.java b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/RFC2231Utils.java
similarity index 99%
rename from commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/RFC2231Utility.java
rename to commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/RFC2231Utils.java
index aa51ce5..b8f1ce5 100644
--- a/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/RFC2231Utility.java
+++ b/commons-fileupload2-core/src/main/java/org/apache/commons/fileupload2/RFC2231Utils.java
@@ -30,7 +30,7 @@ import java.io.UnsupportedEncodingException;
* @see <a href="https://tools.ietf.org/html/rfc2231">RFC 2231</a>
* @see <a href="https://tools.ietf.org/html/rfc5987">RFC 5987</a>
*/
-final class RFC2231Utility {
+final class RFC2231Utils {
/**
* The Hexadecimal values char array.
@@ -147,6 +147,6 @@ final class RFC2231Utility {
/**
* Private constructor so that no instances can be created. This class contains only static utility methods.
*/
- private RFC2231Utility() {
+ private RFC2231Utils() {
}
}
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/MimeUtilityTestCase.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/MimeUtilityTestCase.java
index 9662306..1dc99f5 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/MimeUtilityTestCase.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/MimeUtilityTestCase.java
@@ -21,7 +21,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
import java.io.UnsupportedEncodingException;
-import org.apache.commons.fileupload2.MimeUtility;
+import org.apache.commons.fileupload2.MimeUtils;
import org.junit.jupiter.api.Test;
/**
@@ -30,12 +30,12 @@ import org.junit.jupiter.api.Test;
public final class MimeUtilityTestCase {
private static void assertEncoded(final String expected, final String encoded) throws Exception {
- assertEquals(expected, MimeUtility.decodeText(encoded));
+ assertEquals(expected, MimeUtils.decodeText(encoded));
}
@Test
public void decodeInvalidEncoding() {
- assertThrows(UnsupportedEncodingException.class, () -> MimeUtility.decodeText("=?invalid?B?xyz-?="));
+ assertThrows(UnsupportedEncodingException.class, () -> MimeUtils.decodeText("=?invalid?B?xyz-?="));
}
@Test
diff --git a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/RFC2231UtilityTestCase.java b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/RFC2231UtilityTestCase.java
index 7acd2bd..1bf3fd2 100644
--- a/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/RFC2231UtilityTestCase.java
+++ b/commons-fileupload2-core/src/test/java/org/apache/commons/fileupload2/RFC2231UtilityTestCase.java
@@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.io.UnsupportedEncodingException;
-import org.apache.commons.fileupload2.RFC2231Utility;
+import org.apache.commons.fileupload2.RFC2231Utils;
import org.junit.jupiter.api.Test;
/**
@@ -34,12 +34,12 @@ import org.junit.jupiter.api.Test;
public final class RFC2231UtilityTestCase {
private static void assertEncoded(final String expected, final String encoded) throws Exception {
- assertEquals(expected, RFC2231Utility.decodeText(encoded));
+ assertEquals(expected, RFC2231Utils.decodeText(encoded));
}
@Test
public void decodeInvalidEncoding() throws Exception {
- assertThrows(UnsupportedEncodingException.class, () -> RFC2231Utility.decodeText("abc'en'hello"));
+ assertThrows(UnsupportedEncodingException.class, () -> RFC2231Utils.decodeText("abc'en'hello"));
}
@Test
@@ -60,27 +60,27 @@ public final class RFC2231UtilityTestCase {
@Test
public void testHasEncodedValue() {
final String nameWithAsteriskAtEnd = "paramname*";
- assertTrue(RFC2231Utility.hasEncodedValue(nameWithAsteriskAtEnd));
+ assertTrue(RFC2231Utils.hasEncodedValue(nameWithAsteriskAtEnd));
final String nameWithAsteriskNotAtEnd = "param*name";
- assertFalse(RFC2231Utility.hasEncodedValue(nameWithAsteriskNotAtEnd));
+ assertFalse(RFC2231Utils.hasEncodedValue(nameWithAsteriskNotAtEnd));
final String nameWithoutAsterisk = "paramname";
- assertFalse(RFC2231Utility.hasEncodedValue(nameWithoutAsterisk));
+ assertFalse(RFC2231Utils.hasEncodedValue(nameWithoutAsterisk));
}
@Test
public void testStripDelimiter() {
final String nameWithAsteriskAtEnd = "paramname*";
- assertEquals("paramname", RFC2231Utility.stripDelimiter(nameWithAsteriskAtEnd));
+ assertEquals("paramname", RFC2231Utils.stripDelimiter(nameWithAsteriskAtEnd));
final String nameWithAsteriskNotAtEnd = "param*name";
- assertEquals("param*name", RFC2231Utility.stripDelimiter(nameWithAsteriskNotAtEnd));
+ assertEquals("param*name", RFC2231Utils.stripDelimiter(nameWithAsteriskNotAtEnd));
final String nameWithTwoAsterisks = "param*name*";
- assertEquals("param*name", RFC2231Utility.stripDelimiter(nameWithTwoAsterisks));
+ assertEquals("param*name", RFC2231Utils.stripDelimiter(nameWithTwoAsterisks));
final String nameWithoutAsterisk = "paramname";
- assertEquals("paramname", RFC2231Utility.stripDelimiter(nameWithoutAsterisk));
+ assertEquals("paramname", RFC2231Utils.stripDelimiter(nameWithoutAsterisk));
}
}