use immutable.Seq instead of Array.

krasserm · Jan 4, 2016 · 416d2a1 · 416d2a1
1 parent 84d8e86
commit 416d2a1
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/src/main/scala/akka/persistence/cassandra/SSLSetup.scala b/src/main/scala/akka/persistence/cassandra/SSLSetup.scala
@@ -1,8 +1,9 @@
 package akka.persistence.cassandra
 
-import java.io.{File, FileInputStream, InputStream}
+import java.io.{File, FileInputStream}
 import java.security.{KeyStore, SecureRandom}
 import javax.net.ssl.{KeyManagerFactory, SSLContext, TrustManagerFactory, TrustManager, KeyManager}
+import scala.collection.immutable.Seq
 
 private [cassandra] object SSLSetup {
   /**
@@ -16,8 +17,8 @@ private [cassandra] object SSLSetup {
 
     val ctx = SSLContext.getInstance("SSL")   
     ctx.init(
-      getKeyManagers(keyStorePath, keyStorePW),
-      getTrustManagers(trustStorePath, trustStorePW), 
+      getKeyManagers(keyStorePath, keyStorePW).toArray,
+      getTrustManagers(trustStorePath, trustStorePW).toArray, 
       new SecureRandom())
     ctx
   }
@@ -39,9 +40,9 @@ private [cassandra] object SSLSetup {
 
   def getTrustManagers(
     trustStorePath:Option[String],
-    trustStorePassword:Option[String]):Array[TrustManager] = {
+    trustStorePassword:Option[String]):Seq[TrustManager] = {
 
-    trustStorePath.toArray.flatMap{ path =>
+    trustStorePath.toList.flatMap{ path =>
       val ts = loadKeyStore(path, trustStorePassword.getOrElse("changeit"))
       val tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm)
       tmf.init(ts)
@@ -51,9 +52,9 @@ private [cassandra] object SSLSetup {
 
   def getKeyManagers(
     keyStorePath:Option[String],
-    keyStorePassword:Option[String]):Array[KeyManager] = {
+    keyStorePassword:Option[String]):Seq[KeyManager] = {
 
-    keyStorePath.toArray.flatMap { path =>
+    keyStorePath.toList.flatMap { path =>
       val password = keyStorePassword.getOrElse("changeit")
       val ks = loadKeyStore(path, password)
       val kmf = KeyManagerFactory.getInstance(KeyManagerFactory.getDefaultAlgorithm)