Merge pull request #38 from mihbor/37

change Option to Optional in javadsl

Author: kijanowski

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

@@ -6,8 +6,8 @@
 import com.softwaremill.session.SessionContinuity;
 import com.softwaremill.session.SessionManager;
 import com.softwaremill.session.SetSessionTransport;
-import scala.Option;
 
+import java.util.Optional;
 import java.util.function.Function;
 import java.util.function.Supplier;
 
@@ -24,7 +24,7 @@ public Route setSession(SessionContinuity sc, SetSessionTransport st, T session,
         return SessionDirectives$.MODULE$.setSession(sc, st, session, continuity);
     }
 
-    public Route optionalSession(SessionContinuity sc, SetSessionTransport st, Function<Option<T>, Route> continuity) {
+    public Route optionalSession(SessionContinuity sc, SetSessionTransport st, Function<Optional<T>, Route> continuity) {
         return SessionDirectives$.MODULE$.optionalSession(sc, st, continuity);
     }
 

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

@@ -1,7 +1,10 @@
 package com.softwaremill.session.javadsl
 
+import java.util.Optional
 import java.util.function.Supplier
 
+import scala.compat.java8.OptionConverters._
+
 import akka.http.javadsl.server.Route
 import akka.http.javadsl.server.directives.RouteAdapter
 import com.softwaremill.session._
@@ -23,9 +26,9 @@ trait SessionDirectives extends OneOffSessionDirectives with RefreshableSessionD
     }
   }
 
-  def optionalSession[T](sc: SessionContinuity[T], st: GetSessionTransport, inner: java.util.function.Function[Option[T], Route]): Route = RouteAdapter {
+  def optionalSession[T](sc: SessionContinuity[T], st: GetSessionTransport, inner: java.util.function.Function[Optional[T], Route]): Route = RouteAdapter {
     com.softwaremill.session.SessionDirectives.optionalSession(sc, st) { session =>
-      inner.apply(session).asInstanceOf[RouteAdapter].delegate
+      inner.apply(session.asJava).asInstanceOf[RouteAdapter].delegate
     }
   }
 

javaTests/src/test/java/com/softwaremill/session/javadsl/HttpSessionAwareDirectivesTest.java

@@ -39,8 +39,8 @@
 public abstract class HttpSessionAwareDirectivesTest extends JUnitRouteTest {
 
     static final String SESSION = "my session object";
-    static final String EXPECTED_SESSION = format("Some(%s)", SESSION);
-    static final String NO_SESSION = "None";
+    static final String EXPECTED_SESSION = format("Optional[%s]", SESSION);
+    static final String NO_SESSION = "Optional.empty";
     static final String URL_ENCODED_SESSION = encode();
     private static final String SECRET = "c05ll3lesrinf39t7mc5h6un6r0c69lgfno69dsak3vabeqamouq4328cuaekros401ajdpkh60rrtpd8ro24rbuqmgtnd1ebag6ljnb65i8a55d482ok7o0nch0bfbe";
     private static final String MAX_SESSION_AGE = "60 seconds";