review fixes 2nd part

Author: kijanowski

core/src/main/java/com/softwaremill/session/javadsl/CsrfDirectives.scala

@@ -0,0 +1,29 @@
+package com.softwaremill.session.javadsl
+
+import java.util.function.Supplier
+
+import akka.http.javadsl.server.Route
+import akka.http.javadsl.server.directives.RouteAdapter
+import com.softwaremill.session.CsrfCheckMode
+
+trait CsrfDirectives {
+
+  /**
+    * Java alternative for com.softwaremill.session.CsrfDirectives
+    */
+  def randomTokenCsrfProtection[T](checkMode: CsrfCheckMode[T], inner: Supplier[Route]): Route = RouteAdapter {
+    com.softwaremill.session.CsrfDirectives.randomTokenCsrfProtection(checkMode) {
+      inner.get.asInstanceOf[RouteAdapter].delegate
+    }
+  }
+
+  def setNewCsrfToken[T](checkMode: CsrfCheckMode[T], inner: Supplier[Route]): Route = RouteAdapter {
+    com.softwaremill.session.CsrfDirectives.setNewCsrfToken(checkMode) {
+      inner.get.asInstanceOf[RouteAdapter].delegate
+    }
+  }
+
+
+}
+
+object CsrfDirectives extends CsrfDirectives

core/src/main/java/com/softwaremill/session/javadsl/HttpSessionAwareDirectives.java

@@ -3,9 +3,7 @@
 import akka.http.javadsl.server.AllDirectives;
 import akka.http.javadsl.server.Route;
 import com.softwaremill.session.CsrfCheckMode;
-import com.softwaremill.session.CsrfDirectives$;
 import com.softwaremill.session.SessionContinuity;
-import com.softwaremill.session.SessionDirectives$;
 import com.softwaremill.session.SessionManager;
 import com.softwaremill.session.SetSessionTransport;
 import scala.Option;

core/src/main/java/com/softwaremill/session/javadsl/SessionDirectives.scala

@@ -0,0 +1,47 @@
+package com.softwaremill.session.javadsl
+
+import java.util.function.Supplier
+
+import akka.http.javadsl.server.Route
+import akka.http.javadsl.server.directives.RouteAdapter
+import com.softwaremill.session._
+
+/**
+  * Java alternative for  com.softwaremill.session.SessionDirectives
+  */
+trait SessionDirectives extends OneOffSessionDirectives with RefreshableSessionDirectives {
+
+  def setSession[T](sc: SessionContinuity[T], st: SetSessionTransport, v: T, inner: Supplier[Route]): Route = RouteAdapter {
+    com.softwaremill.session.SessionDirectives.setSession(sc, st, v) {
+      inner.get.asInstanceOf[RouteAdapter].delegate
+    }
+  }
+
+  def invalidateSession[T](sc: SessionContinuity[T], st: GetSessionTransport, inner: Supplier[Route]): Route = RouteAdapter {
+    com.softwaremill.session.SessionDirectives.invalidateSession(sc, st) {
+      inner.get.asInstanceOf[RouteAdapter].delegate
+    }
+  }
+
+  def optionalSession[T](sc: SessionContinuity[T], st: GetSessionTransport, inner: java.util.function.Function[Option[T], Route]): Route = RouteAdapter {
+    com.softwaremill.session.SessionDirectives.optionalSession(sc, st) { session =>
+      inner.apply(session).asInstanceOf[RouteAdapter].delegate
+    }
+  }
+
+  def requiredSession[T](sc: SessionContinuity[T], st: GetSessionTransport, inner: java.util.function.Function[T, Route]): Route = RouteAdapter {
+    com.softwaremill.session.SessionDirectives.requiredSession(sc, st) { session =>
+      inner.apply(session).asInstanceOf[RouteAdapter].delegate
+    }
+  }
+
+  def touchRequiredSession[T](sc: SessionContinuity[T], st: GetSessionTransport, inner: java.util.function.Function[T, Route]): Route = RouteAdapter {
+    com.softwaremill.session.SessionDirectives.touchRequiredSession(sc, st) { session =>
+      inner.apply(session).asInstanceOf[RouteAdapter].delegate
+    }
+  }
+
+}
+
+object SessionDirectives extends SessionDirectives
+

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

@@ -1,9 +1,5 @@
 package com.softwaremill.session
 
-import java.util.function.Supplier
-
-import akka.http.javadsl.server.Route
-import akka.http.javadsl.server.directives.RouteAdapter
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.{Directive0, Directive1}
 import akka.stream.Materializer
@@ -40,15 +36,6 @@ trait CsrfDirectives {
     }
   }
 
-  /**
-   * Java alternative
-   */
-  def randomTokenCsrfProtection[T](checkMode: CsrfCheckMode[T], inner: Supplier[Route]): Route = RouteAdapter {
-    randomTokenCsrfProtection(checkMode) {
-      inner.get.asInstanceOf[RouteAdapter].delegate
-    }
-  }
-
   def submittedCsrfToken[T](checkMode: CsrfCheckMode[T]): Directive1[String] = {
     headerValueByName(checkMode.manager.config.csrfSubmittedName).recover { rejections =>
       checkMode match {
@@ -65,15 +52,6 @@ trait CsrfDirectives {
 
   def setNewCsrfToken[T](checkMode: CsrfCheckMode[T]): Directive0 =
     setCookie(checkMode.csrfManager.createCookie())
-
-  /**
-   * Java alternative
-   */
-  def setNewCsrfToken[T](checkMode: CsrfCheckMode[T], inner: Supplier[Route]): Route = RouteAdapter {
-    setNewCsrfToken(checkMode) {
-      inner.get.asInstanceOf[RouteAdapter].delegate
-    }
-  }
 }
 
 object CsrfDirectives extends CsrfDirectives

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

@@ -1,9 +1,5 @@
 package com.softwaremill.session
 
-import java.util.function.Supplier
-
-import akka.http.javadsl.server.Route
-import akka.http.javadsl.server.directives.RouteAdapter
 import akka.http.scaladsl.server.Directives._
 import akka.http.scaladsl.server.{Directive0, Directive1}
 
@@ -26,15 +22,6 @@ trait SessionDirectives extends OneOffSessionDirectives with RefreshableSessionD
     }
   }
 
-  /**
-   * Java alternative
-   */
-  def setSession[T](sc: SessionContinuity[T], st: SetSessionTransport, v: T, inner: Supplier[Route]): Route = RouteAdapter {
-    setSession(sc, st, v) {
-      inner.get.asInstanceOf[RouteAdapter].delegate
-    }
-  }
-
   /**
    * Read a session from the session cookie, wrapped in [[SessionResult]] describing the possible
    * success/failure outcomes.
@@ -63,30 +50,12 @@ trait SessionDirectives extends OneOffSessionDirectives with RefreshableSessionD
     }
   }
 
-  /**
-   * Java alternative
-   */
-  def invalidateSession[T](sc: SessionContinuity[T], st: GetSessionTransport, inner: Supplier[Route]): Route = RouteAdapter {
-    invalidateSession(sc, st) {
-      inner.get.asInstanceOf[RouteAdapter].delegate
-    }
-  }
-
   /**
    * Read an optional session from the session cookie.
    */
   def optionalSession[T](sc: SessionContinuity[T], st: GetSessionTransport): Directive1[Option[T]] =
     session(sc, st).map(_.toOption)
 
-  /**
-   * Java alternative
-   */
-  def optionalSession[T](sc: SessionContinuity[T], st: GetSessionTransport, inner: java.util.function.Function[Option[T], Route]): Route = RouteAdapter {
-    optionalSession(sc, st) { session =>
-      inner.apply(session).asInstanceOf[RouteAdapter].delegate
-    }
-  }
-
   /**
    * Read a required session from the session cookie.
    */
@@ -96,15 +65,6 @@ trait SessionDirectives extends OneOffSessionDirectives with RefreshableSessionD
       case Some(data) => provide(data)
     }
 
-  /**
-   * Java alternative
-   */
-  def requiredSession[T](sc: SessionContinuity[T], st: GetSessionTransport, inner: java.util.function.Function[T, Route]): Route = RouteAdapter {
-    requiredSession(sc, st) { session =>
-      inner.apply(session).asInstanceOf[RouteAdapter].delegate
-    }
-  }
-
   /**
    * Sets the session cookie again with the same data. Useful when using the [[SessionConfig.sessionMaxAgeSeconds]]
    * option, as it sets the expiry date anew.
@@ -121,15 +81,6 @@ trait SessionDirectives extends OneOffSessionDirectives with RefreshableSessionD
     requiredSession(sc, st).flatMap { d => setOneOffSessionSameTransport(sc, st, d) & provide(d) }
   }
 
-  /**
-   * Java alternative
-   */
-  def touchRequiredSession[T](sc: SessionContinuity[T], st: GetSessionTransport, inner: java.util.function.Function[T, Route]): Route = RouteAdapter {
-    touchRequiredSession(sc, st) { session =>
-      inner.apply(session).asInstanceOf[RouteAdapter].delegate
-    }
-  }
-
 }
 
 object SessionDirectives extends SessionDirectives