This is an automated email from the ASF dual-hosted git repository.
garydgregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-codec.git
The following commit(s) were added to refs/heads/master by this push:
new 907bd789 Sort members.
907bd789 is described below
commit 907bd78908d1c13e34ebfffae36a63286a9b0a29
Author: Gary Gregory <[email protected]>
AuthorDate: Sat Jul 18 14:28:16 2026 -0700
Sort members.
---
.../java/org/apache/commons/codec/binary/Base64.java | 16 ++++++++--------
.../java/org/apache/commons/codec/binary/Base64Test.java | 16 ++++++++--------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/main/java/org/apache/commons/codec/binary/Base64.java
b/src/main/java/org/apache/commons/codec/binary/Base64.java
index b6c254df..031becae 100644
--- a/src/main/java/org/apache/commons/codec/binary/Base64.java
+++ b/src/main/java/org/apache/commons/codec/binary/Base64.java
@@ -380,14 +380,6 @@ public class Base64 extends BaseNCodec {
return false;
}
- private static byte[] toDecodeTable(final byte[] encodeTable) {
- final byte[] table = encodeTable != null ? encodeTable :
STANDARD_ENCODE_TABLE;
- if (Arrays.equals(table, STANDARD_ENCODE_TABLE) ||
Arrays.equals(table, URL_SAFE_ENCODE_TABLE)) {
- return DECODE_TABLE;
- }
- return calculateDecodeTable(table);
- }
-
/**
* Decodes Base64 data into octets.
* <p>
@@ -787,6 +779,14 @@ public class Base64 extends BaseNCodec {
return isBase64Url(StringUtils.getBytesUtf8(base64));
}
+ private static byte[] toDecodeTable(final byte[] encodeTable) {
+ final byte[] table = encodeTable != null ? encodeTable :
STANDARD_ENCODE_TABLE;
+ if (Arrays.equals(table, STANDARD_ENCODE_TABLE) ||
Arrays.equals(table, URL_SAFE_ENCODE_TABLE)) {
+ return DECODE_TABLE;
+ }
+ return calculateDecodeTable(table);
+ }
+
static byte[] toUrlSafeEncodeTable(final boolean urlSafe) {
return urlSafe ? URL_SAFE_ENCODE_TABLE : STANDARD_ENCODE_TABLE;
}
diff --git a/src/test/java/org/apache/commons/codec/binary/Base64Test.java
b/src/test/java/org/apache/commons/codec/binary/Base64Test.java
index cc2d927e..4051c4da 100644
--- a/src/test/java/org/apache/commons/codec/binary/Base64Test.java
+++ b/src/test/java/org/apache/commons/codec/binary/Base64Test.java
@@ -529,6 +529,14 @@ class Base64Test {
assertEquals(content, decodeString);
}
+ @Test
+ void testCustomEncodingAlphabet_illegal() {
+ final byte[] encodeTable = {
+ '.', '-', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M'
+ };
+ assertThrows(IllegalArgumentException.class, () ->
Base64.builder().setEncodeTable(encodeTable).get());
+ }
+
@Test
void testCustomEncodingAlphabetAllowsNonAsciiBytes() {
final byte[] encodeTable = STANDARD_ENCODE_TABLE.clone();
@@ -565,14 +573,6 @@ class Base64Test {
assertThrows(IllegalArgumentException.class, () ->
Base64.builder().setEncodeTable(encodeTable));
}
- @Test
- void testCustomEncodingAlphabet_illegal() {
- final byte[] encodeTable = {
- '.', '-', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M'
- };
- assertThrows(IllegalArgumentException.class, () ->
Base64.builder().setEncodeTable(encodeTable).get());
- }
-
@Test
void testDecodeBase64DiffChars() {
assertArrayEquals(new byte[] { 102, 111, 111, 98, 97 },
Base64.decodeBase64("Zm9vYmF"));