From 416d2a18b9b510b7f2f976feaf08a158437ce20c Mon Sep 17 00:00:00 2001 From: Matthias Brandt Date: Mon, 4 Jan 2016 13:55:45 +0100 Subject: [PATCH] use immutable.Seq instead of Array. --- .../akka/persistence/cassandra/SSLSetup.scala | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/scala/akka/persistence/cassandra/SSLSetup.scala b/src/main/scala/akka/persistence/cassandra/SSLSetup.scala index c082e74f..03db07c8 100644 --- 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)