Skip to content

Commit df53f89

Browse files
committed
Return byte[] in base64 encoder instead of String (internally)
1 parent 0dcbc23 commit df53f89

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

src/main/java/at/favre/lib/bytes/Base64.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@
2121

2222
package at.favre.lib.bytes;
2323

24-
import java.nio.charset.StandardCharsets;
25-
2624
/**
2725
* From https://github.com/square/okio/blob/okio-parent-1.15.0/okio/src/main/java/okio/Base64.java
2826
* under Apache 2 license.
@@ -128,15 +126,15 @@ static byte[] decode(String in) {
128126
return prefix;
129127
}
130128

131-
static String encode(byte[] in) {
129+
static byte[] encode(byte[] in) {
132130
return encode(in, false, true);
133131
}
134132

135-
static String encode(byte[] in, boolean urlSafe, boolean usePadding) {
133+
static byte[] encode(byte[] in, boolean urlSafe, boolean usePadding) {
136134
return encode(in, urlSafe ? URL_MAP : MAP, usePadding);
137135
}
138136

139-
private static String encode(byte[] in, byte[] map, boolean usePadding) {
137+
private static byte[] encode(byte[] in, byte[] map, boolean usePadding) {
140138
int length = outLength(in.length, usePadding);
141139
byte[] out = new byte[length];
142140
int index = 0, end = in.length - in.length % 3;
@@ -165,7 +163,7 @@ private static String encode(byte[] in, byte[] map, boolean usePadding) {
165163
}
166164
break;
167165
}
168-
return new String(out, StandardCharsets.US_ASCII);
166+
return out;
169167
}
170168

171169
private static int outLength(int srclen, boolean doPadding) {

src/main/java/at/favre/lib/bytes/BinaryToTextEncoding.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import java.math.BigInteger;
2525
import java.nio.ByteOrder;
26+
import java.nio.charset.StandardCharsets;
2627
import java.util.Objects;
2728

2829
/**
@@ -146,7 +147,7 @@ class Base64Encoding implements EncoderDecoder {
146147

147148
@Override
148149
public String encode(byte[] array, ByteOrder byteOrder) {
149-
return Base64.encode((byteOrder == ByteOrder.BIG_ENDIAN) ? array : Bytes.from(array).reverse().array(), urlSafe, padding);
150+
return new String(Base64.encode((byteOrder == ByteOrder.BIG_ENDIAN) ? array : Bytes.from(array).reverse().array(), urlSafe, padding), StandardCharsets.US_ASCII);
150151
}
151152

152153
@Override

0 commit comments

Comments
 (0)