Slightly faster Base64 implementation

RADAR-base · Jun 23, 2020 · 8136c94 · 8136c94
1 parent 70e51d2
commit 8136c94
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/radar-commons/src/main/java/org/radarbase/util/Base64.java b/radar-commons/src/main/java/org/radarbase/util/Base64.java
@@ -25,6 +25,8 @@
 
 package org.radarbase.util;
 
+import static java.nio.charset.StandardCharsets.UTF_8;  // Since Android API 19
+
 /**
  * This class consists exclusively of static methods for obtaining
  * encoders and decoders for the Base64 encoding scheme. The
@@ -134,7 +136,7 @@ public String encode(byte[] src) {
                 dst[dstP] = '=';
             }
 
-            return new String(dst);
+            return new String(dst, UTF_8);
         }
     }
 }
diff --git a/radar-commons/src/test/java/org/radarbase/util/Base64Test.java b/radar-commons/src/test/java/org/radarbase/util/Base64Test.java
@@ -14,7 +14,7 @@ public void encoderTest() {
         java.util.Base64.Encoder javaEncoder = java.util.Base64.getEncoder();
 
         ThreadLocalRandom random = ThreadLocalRandom.current();
-        for (int i = 0; i < 2_000; i++) {
+        for (int i = 0; i < 2_000; i += 7) {
             byte[] src = new byte[i];
             random.nextBytes(src);
             String actual = encoder.encode(src);