review fixes - 1st part

Author: kijanowski

build.sbt

@@ -54,7 +54,7 @@ lazy val core: Project = (project in file("core"))
   .settings(commonSettings: _*)
   .settings(
     name := "core",
-    testOptions in Test := Seq(Tests.Argument(TestFrameworks.JUnit, "-a")),
+    testOptions in Test := Seq(Tests.Argument(TestFrameworks.JUnit, "-a")), // required for javadsl JUnit tests
     crossPaths := false, // https://github.com/sbt/junit-interface/issues/35
     libraryDependencies ++= Seq(
       "com.typesafe.akka" %% "akka-http" % akkaHttpVersion,

core/src/main/scala/com/softwaremill/session/SessionConfig.scala

@@ -112,6 +112,8 @@ object SessionConfig {
   /**
    * Creates a default configuration using the given secret.
    */
-  def defaultConfig(serverSecret: String) = fromConfig(ConfigFactory.load()
+  def default(serverSecret: String): SessionConfig = fromConfig(ConfigFactory.load()
     .withValue("akka.http.session.server-secret", ConfigValueFactory.fromAnyRef(serverSecret)))
+
+  def defaultConfig(serverSecret: String): SessionConfig = default(serverSecret) // required for javadsl directives, because default is a keyword
 }

core/src/test/scala/com/softwaremill/session/SessionManagerBasicEncoderTest.scala

@@ -10,7 +10,7 @@ object SessionManagerBasicEncoderTest extends Properties("SessionManagerBasicEnc
 
   property("encode+decode") = forAllNoShrink(secretGen) { (secret: String) =>
     forAll { (encrypt: Boolean, useMaxAgeSeconds: Boolean, data: Map[String, String]) =>
-      val config = SessionConfig.defaultConfig(secret)
+      val config = SessionConfig.default(secret)
         .copy(sessionEncryptData = encrypt)
         .copy(sessionMaxAgeSeconds = if (useMaxAgeSeconds) Some(3600L) else None)
       val manager = new SessionManager[Map[String, String]](config).clientSessionManager
@@ -21,7 +21,7 @@ object SessionManagerBasicEncoderTest extends Properties("SessionManagerBasicEnc
 
   property("doesn't decode expired session") = forAllNoShrink(secretGen) { (secret: String) =>
     forAll { (encrypt: Boolean, data: Map[String, String]) =>
-      val config = SessionConfig.defaultConfig(secret)
+      val config = SessionConfig.default(secret)
         .copy(sessionEncryptData = encrypt)
         .copy(sessionMaxAgeSeconds = Some(20L)) // expires after 20s
       val managerPast = new SessionManager[Map[String, String]](config) {

core/src/test/scala/com/softwaremill/session/TestData.scala

@@ -1,7 +1,7 @@
 package com.softwaremill.session
 
 object TestData {
-  val sessionConfig = SessionConfig.defaultConfig("c05ll3lesrinf39t7mc5h6un6r0c69lgfno69dsak3vabeqamouq4328cuaekros401ajdpkh60rrtpd8ro24rbuqmgtnd1ebag6ljnb65i8a55d482ok7o0nch0bfbe")
+  val sessionConfig = SessionConfig.default("c05ll3lesrinf39t7mc5h6un6r0c69lgfno69dsak3vabeqamouq4328cuaekros401ajdpkh60rrtpd8ro24rbuqmgtnd1ebag6ljnb65i8a55d482ok7o0nch0bfbe")
   implicit val manager = new SessionManager[Map[String, String]](sessionConfig)
 
   type SMan = SessionManager[Map[String, String]]

example/src/main/scala/com/softwaremill/example/Example.scala

@@ -20,7 +20,7 @@ object Example extends App with StrictLogging {
   implicit val materializer = ActorMaterializer()
   import system.dispatcher
 
-  val sessionConfig = SessionConfig.defaultConfig("c05ll3lesrinf39t7mc5h6un6r0c69lgfno69dsak3vabeqamouq4328cuaekros401ajdpkh60rrtpd8ro24rbuqmgtnd1ebag6ljnb65i8a55d482ok7o0nch0bfbe")
+  val sessionConfig = SessionConfig.default("c05ll3lesrinf39t7mc5h6un6r0c69lgfno69dsak3vabeqamouq4328cuaekros401ajdpkh60rrtpd8ro24rbuqmgtnd1ebag6ljnb65i8a55d482ok7o0nch0bfbe")
   implicit val sessionManager = new SessionManager[ExampleSession](sessionConfig)
   implicit val refreshTokenStorage = new InMemoryRefreshTokenStorage[ExampleSession] {
     def log(msg: String) = logger.info(msg)

jwt/src/test/scala/com/softwaremill/session/SessionManagerJwtEncoderTest.scala

@@ -4,7 +4,7 @@ import org.json4s.JValue
 import org.scalatest.{Matchers, FlatSpec}
 
 class SessionManagerJwtEncoderTest extends FlatSpec with Matchers {
-  val defaultConfig = SessionConfig.defaultConfig("1234567890123456789012345678901234567890123456789012345678901234567890")
+  val defaultConfig = SessionConfig.default("1234567890123456789012345678901234567890123456789012345678901234567890")
   val configMaxAge = defaultConfig.copy(sessionMaxAgeSeconds = Some(3600))
   val configEncrypted = defaultConfig.copy(sessionEncryptData = true)
   val configEncryptedMaxAge = configMaxAge.copy(sessionEncryptData = true)