[HOTFIX] Fix Base64 not existed in jdk7 issue

dima-asana · Jun 13, 2018 · 551dd5c · 551dd5c
1 parent 2196302
commit 551dd5c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -61,6 +61,11 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+    </dependency>
   </dependencies>
 
 </project>
diff --git a/core/src/main/scala/org/apache/livy/Utils.scala b/core/src/main/scala/org/apache/livy/Utils.scala
@@ -21,13 +21,15 @@ import java.io.{Closeable, File, InputStreamReader}
 import java.net.URL
 import java.nio.charset.StandardCharsets.UTF_8
 import java.security.SecureRandom
-import java.util.{Base64, Properties}
+import java.util.Properties
 
 import scala.annotation.tailrec
 import scala.collection.JavaConverters._
 import scala.concurrent.TimeoutException
 import scala.concurrent.duration.Duration
 
+import org.apache.commons.codec.binary.Base64
+
 object Utils {
   def getPropertiesFromFile(file: File): Map[String, String] = {
     loadProperties(file.toURI().toURL())
@@ -111,6 +113,7 @@ object Utils {
     val rnd = new SecureRandom()
     val secretBytes = new Array[Byte](secretBitLength / java.lang.Byte.SIZE)
     rnd.nextBytes(secretBytes)
-    Base64.getEncoder.encodeToString(secretBytes)
+
+    Base64.encodeBase64String(secretBytes)
   }
 }