review fixes 3rd part - move token storage to javadsl package

Author: kijanowski

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

@@ -0,0 +1,7 @@
+package com.softwaremill.session.javadsl
+
+/**
+ * Can't use the trait com.softwaremill.session.InMemoryRefreshTokenStorage in Java code, hence this wrapper
+ * http://stackoverflow.com/questions/7637752/using-scala-traits-with-implemented-methods-in-java
+ */
+abstract class InMemoryRefreshTokenStorage[T]() extends com.softwaremill.session.InMemoryRefreshTokenStorage[T]

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

@@ -67,9 +67,3 @@ trait InMemoryRefreshTokenStorage[T] extends RefreshTokenStorage[T] {
 
   def log(msg: String): Unit
 }
-
-/**
- * Can't use the trait above in Java code, hence this wrapper
- * http://stackoverflow.com/questions/7637752/using-scala-traits-with-implemented-methods-in-java
- */
-abstract class InMemoryRefreshTokenStorageWrapper[T]() extends InMemoryRefreshTokenStorage[T]

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

@@ -13,7 +13,6 @@
 import com.softwaremill.session.CheckHeader;
 import com.softwaremill.session.CheckHeaderAndForm;
 import com.softwaremill.session.CsrfCheckMode;
-import com.softwaremill.session.InMemoryRefreshTokenStorageWrapper;
 import com.softwaremill.session.OneOff;
 import com.softwaremill.session.RefreshTokenStorage;
 import com.softwaremill.session.Refreshable;
@@ -54,7 +53,7 @@ public abstract class HttpSessionAwareDirectivesTest extends JUnitRouteTest {
         )
     );
     // in-memory refresh token storage
-    private static final RefreshTokenStorage<String> REFRESH_TOKEN_STORAGE = new InMemoryRefreshTokenStorageWrapper<String>() {
+    private static final RefreshTokenStorage<String> REFRESH_TOKEN_STORAGE = new InMemoryRefreshTokenStorage<String>() {
         private Logger logger = Logger.getLogger("TokenStorage");
 
         @Override

example/src/main/java/com/softwaremill/example/JavaExample.java

@@ -17,7 +17,7 @@
 import com.softwaremill.session.BasicSessionEncoder;
 import com.softwaremill.session.CheckHeader;
 import com.softwaremill.session.CookieST$;
-import com.softwaremill.session.InMemoryRefreshTokenStorageWrapper;
+import com.softwaremill.session.javadsl.InMemoryRefreshTokenStorage;
 import com.softwaremill.session.RefreshTokenStorage;
 import com.softwaremill.session.Refreshable;
 import com.softwaremill.session.SessionConfig;
@@ -38,7 +38,7 @@ public class JavaExample extends HttpSessionAwareDirectives<MySession> {
     private static final SessionEncoder<MySession> BASIC_ENCODER = new BasicSessionEncoder<>(MySession.getSerializer());
 
     // in-memory refresh token storage
-    private static final RefreshTokenStorage<MySession> REFRESH_TOKEN_STORAGE = new InMemoryRefreshTokenStorageWrapper<MySession>() {
+    private static final RefreshTokenStorage<MySession> REFRESH_TOKEN_STORAGE = new InMemoryRefreshTokenStorage<MySession>() {
         @Override
         public void log(String msg) {
             logger.info(msg);

example/src/main/java/com/softwaremill/example/JavaJwtExample.java

@@ -16,7 +16,7 @@
 import akka.stream.javadsl.Flow;
 import com.softwaremill.session.CheckHeader;
 import com.softwaremill.session.CookieST$;
-import com.softwaremill.session.InMemoryRefreshTokenStorageWrapper;
+import com.softwaremill.session.javadsl.InMemoryRefreshTokenStorage;
 import com.softwaremill.session.JValueSessionSerializer$;
 import com.softwaremill.session.JwtSessionEncoder;
 import com.softwaremill.session.RefreshTokenStorage;
@@ -40,7 +40,7 @@ public class JavaJwtExample extends HttpSessionAwareDirectives<String> {
     private static final SessionEncoder<String> JWT_ENCODER = new JwtSessionEncoder<>(JValueSessionSerializer$.MODULE$.stringToJValueSessionSerializer(), DefaultFormats$.MODULE$);
 
     // in-memory refresh token storage
-    private static final RefreshTokenStorage<String> REFRESH_TOKEN_STORAGE = new InMemoryRefreshTokenStorageWrapper<String>() {
+    private static final RefreshTokenStorage<String> REFRESH_TOKEN_STORAGE = new InMemoryRefreshTokenStorage<String>() {
         @Override
         public void log(String msg) {
             logger.info(msg);