Skip to content
This repository was archived by the owner on Oct 24, 2025. It is now read-only.

Commit 63b0074

Browse files
kijanowskikijanowski
committed
review fixes last part - extract scala module references into separate class
1 parent 5e1bb0c commit 63b0074

File tree

11 files changed

+242
-172
lines changed

11 files changed

+242
-172
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ import akka.http.javadsl.server.Route
66
import akka.http.javadsl.server.directives.RouteAdapter
77
import com.softwaremill.session.CsrfCheckMode
88

9+
/**
10+
* Java alternative for com.softwaremill.session.CsrfDirectives
11+
*/
912
trait CsrfDirectives {
1013

11-
/**
12-
* Java alternative for com.softwaremill.session.CsrfDirectives
13-
*/
1414
def randomTokenCsrfProtection[T](checkMode: CsrfCheckMode[T], inner: Supplier[Route]): Route = RouteAdapter {
1515
com.softwaremill.session.CsrfDirectives.randomTokenCsrfProtection(checkMode) {
1616
inner.get.asInstanceOf[RouteAdapter].delegate

‎core/src/main/java/com/softwaremill/session/javadsl/SessionSerializers.java‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package com.softwaremill.session.javadsl;
2+
3+
import com.softwaremill.session.SessionSerializer;
4+
import com.softwaremill.session.SessionSerializer$;
5+
import scala.collection.immutable.Map;
6+
7+
/**
8+
* Wrapper for session serializers in com.softwaremill.session.SessionSerializer
9+
*/
10+
public final class SessionSerializers {
11+
12+
public static final SessionSerializer<String, String> StringToStringSessionSerializer = SessionSerializer$.MODULE$.stringToStringSessionSerializer();
13+
public static final SessionSerializer IntToStringSessionSerializer = SessionSerializer$.MODULE$.intToStringSessionSerializer();
14+
public static final SessionSerializer LongToStringSessionSerializer = SessionSerializer$.MODULE$.longToStringSessionSerializer();
15+
public static final SessionSerializer FloatToStringSessionSerializer = SessionSerializer$.MODULE$.floatToStringSessionSerializer();
16+
public static final SessionSerializer DoubleToStringSessionSerializer = SessionSerializer$.MODULE$.doubleToStringSessionSerializer();
17+
public static final SessionSerializer<Map<String, String>, String> MapToStringSessionSerializer = SessionSerializer$.MODULE$.mapToStringSessionSerializer();
18+
19+
private SessionSerializers() {
20+
}
21+
22+
}

‎core/src/main/java/com/softwaremill/session/javadsl/SessionTransports.java‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.softwaremill.session.javadsl;
2+
3+
import com.softwaremill.session.CookieST$;
4+
import com.softwaremill.session.HeaderST$;
5+
import com.softwaremill.session.SetSessionTransport;
6+
7+
/**
8+
* Wrapper for session transports in com.softwaremill.session.SetSessionTransport
9+
*/
10+
public final class SessionTransports {
11+
12+
public static final SetSessionTransport CookieST = CookieST$.MODULE$;
13+
public static final SetSessionTransport HeaderST = HeaderST$.MODULE$;
14+
15+
private SessionTransports() {
16+
}
17+
18+
}

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import com.softwaremill.session.SessionContinuity;
2121
import com.softwaremill.session.SessionEncoder;
2222
import com.softwaremill.session.SessionManager;
23-
import com.softwaremill.session.SessionSerializer$;
2423
import com.softwaremill.session.SetSessionTransport;
2524
import com.softwaremill.session.SingleValueSessionSerializer;
2625
import com.typesafe.config.ConfigFactory;
@@ -49,7 +48,7 @@ public abstract class HttpSessionAwareDirectivesTest extends JUnitRouteTest {
4948
new SingleValueSessionSerializer<>(
5049
((JFunction1<String, String>) session -> session),
5150
((JFunction1<String, Try<String>>) session -> Try.apply((JFunction0<String>) (() -> session))),
52-
SessionSerializer$.MODULE$.stringToStringSessionSerializer()
51+
SessionSerializers.StringToStringSessionSerializer
5352
)
5453
);
5554
// in-memory refresh token storage

‎core/src/test/java/com/softwaremill/session/javadsl/OneOffSetRefreshableGetTest.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
import akka.http.javadsl.server.Route;
1010
import akka.http.javadsl.testkit.TestRouteResult;
1111
import akka.http.scaladsl.model.HttpResponse;
12-
import com.softwaremill.session.CookieST$;
1312
import com.softwaremill.session.CsrfCheckMode;
14-
import com.softwaremill.session.HeaderST$;
1513
import com.softwaremill.session.SessionContinuity;
1614
import com.softwaremill.session.SetSessionTransport;
1715
import org.junit.Assert;
1816
import org.junit.Test;
1917

18+
import static com.softwaremill.session.javadsl.SessionTransports.CookieST;
19+
import static com.softwaremill.session.javadsl.SessionTransports.HeaderST;
20+
2021
public class OneOffSetRefreshableGetTest extends HttpSessionAwareDirectivesTest {
2122

2223
protected Route buildRoute(HttpSessionAwareDirectives<String> testDirectives, SessionContinuity<String> oneOff, SessionContinuity<String> refreshable, SetSessionTransport sessionTransport, CsrfCheckMode<String> checkHeader) {
@@ -41,7 +42,7 @@ protected Route buildRoute(HttpSessionAwareDirectives<String> testDirectives, Se
4142
@Test
4243
public void shouldReadAnOptionalSessionWhenOnlyTheSessionIsSet_UsingCookies() {
4344
// given
44-
final Route route = createRoute(CookieST$.MODULE$);
45+
final Route route = createRoute(CookieST);
4546

4647
// and
4748
TestRouteResult setRouteResult = testRoute(route)
@@ -62,7 +63,7 @@ public void shouldReadAnOptionalSessionWhenOnlyTheSessionIsSet_UsingCookies() {
6263
@Test
6364
public void shouldReadAnOptionalSessionWhenOnlyTheSessionIsSet_UsingHeaders() {
6465
// given
65-
final Route route = createRoute(HeaderST$.MODULE$);
66+
final Route route = createRoute(HeaderST);
6667

6768
// and
6869
TestRouteResult setRouteResult = testRoute(route)
@@ -83,7 +84,7 @@ public void shouldReadAnOptionalSessionWhenOnlyTheSessionIsSet_UsingHeaders() {
8384
@Test
8485
public void shouldInvalidateASession_UsingCookies() {
8586
// given
86-
final Route route = createRoute(CookieST$.MODULE$);
87+
final Route route = createRoute(CookieST);
8788

8889
// and
8990
TestRouteResult setRouteResult = testRoute(route)
@@ -110,7 +111,7 @@ public void shouldInvalidateASession_UsingCookies() {
110111
@Test
111112
public void shouldInvalidateASession_UsingHeaders() {
112113
// given
113-
final Route route = createRoute(HeaderST$.MODULE$);
114+
final Route route = createRoute(HeaderST);
114115

115116
// and
116117
TestRouteResult setRouteResult = testRoute(route)
@@ -141,9 +142,9 @@ public void shouldInvalidateASession_UsingHeaders() {
141142

142143
@Test
143144
public void shouldTouchTheSession_WithoutSettingARefreshToken_UsingCookies() {
144-
final Route route_fixed = createRoute(CookieST$.MODULE$, getExpiring60SessionManagerWithFixedTime());
145-
final Route route_fixed_plus30s = createRoute(CookieST$.MODULE$, getExpiring60Plus30SessionManagerWithFixedTime());
146-
final Route route_fixed_plus70s = createRoute(CookieST$.MODULE$, getExpiring60Plus70SessionManagerWithFixedTime());
145+
final Route route_fixed = createRoute(CookieST, getExpiring60SessionManagerWithFixedTime());
146+
final Route route_fixed_plus30s = createRoute(CookieST, getExpiring60Plus30SessionManagerWithFixedTime());
147+
final Route route_fixed_plus70s = createRoute(CookieST, getExpiring60Plus70SessionManagerWithFixedTime());
147148

148149
TestRouteResult setRouteResult = testRoute(route_fixed)
149150
.run(HttpRequest.GET("/set"));
@@ -186,9 +187,9 @@ public void shouldTouchTheSession_WithoutSettingARefreshToken_UsingCookies() {
186187

187188
@Test
188189
public void shouldTouchTheSession_WithoutSettingARefreshToken_UsingHeaders() {
189-
final Route route_fixed = createRoute(HeaderST$.MODULE$, getExpiring60SessionManagerWithFixedTime());
190-
final Route route_fixed_plus30s = createRoute(HeaderST$.MODULE$, getExpiring60Plus30SessionManagerWithFixedTime());
191-
final Route route_fixed_plus70s = createRoute(HeaderST$.MODULE$, getExpiring60Plus70SessionManagerWithFixedTime());
190+
final Route route_fixed = createRoute(HeaderST, getExpiring60SessionManagerWithFixedTime());
191+
final Route route_fixed_plus30s = createRoute(HeaderST, getExpiring60Plus30SessionManagerWithFixedTime());
192+
final Route route_fixed_plus70s = createRoute(HeaderST, getExpiring60Plus70SessionManagerWithFixedTime());
192193

193194
TestRouteResult setRouteResult = testRoute(route_fixed)
194195
.run(HttpRequest.GET("/set"));

‎core/src/test/java/com/softwaremill/session/javadsl/OneOffTest.java‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
import akka.http.javadsl.server.Route;
1010
import akka.http.javadsl.testkit.TestRouteResult;
1111
import akka.http.scaladsl.model.HttpResponse;
12-
import com.softwaremill.session.CookieST$;
1312
import com.softwaremill.session.CsrfCheckMode;
14-
import com.softwaremill.session.HeaderST$;
1513
import com.softwaremill.session.SessionContinuity;
1614
import com.softwaremill.session.SetSessionTransport;
1715
import org.junit.Assert;
1816
import org.junit.Test;
1917

18+
import static com.softwaremill.session.javadsl.SessionTransports.CookieST;
19+
import static com.softwaremill.session.javadsl.SessionTransports.HeaderST;
20+
2021
public class OneOffTest extends HttpSessionAwareDirectivesTest {
2122

2223
protected Route buildRoute(HttpSessionAwareDirectives<String> testDirectives, SessionContinuity<String> oneOff, SessionContinuity<String> refreshable, SetSessionTransport sessionTransport, CsrfCheckMode<String> checkHeader) {
@@ -44,7 +45,7 @@ protected Route buildRoute(HttpSessionAwareDirectives<String> testDirectives, Se
4445
@Test
4546
public void shouldSetTheCorrectSessionCookieName_UsingCookies() {
4647
// given
47-
final Route route = createRoute(CookieST$.MODULE$);
48+
final Route route = createRoute(CookieST);
4849

4950
// when
5051
TestRouteResult testRouteResult = testRoute(route)
@@ -65,7 +66,7 @@ public void shouldSetTheCorrectSessionCookieName_UsingCookies() {
6566
@Test
6667
public void shouldSetTheSession_UsingCookies() {
6768
// given
68-
final Route route = createRoute(CookieST$.MODULE$);
69+
final Route route = createRoute(CookieST);
6970

7071
// when
7172
TestRouteResult testRouteResult = testRoute(route)
@@ -88,7 +89,7 @@ public void shouldSetTheSession_UsingCookies() {
8889
@Test
8990
public void shouldSetTheSession_UsingHeaders() {
9091
// given
91-
final Route route = createRoute(HeaderST$.MODULE$);
92+
final Route route = createRoute(HeaderST);
9293

9394
// when
9495
TestRouteResult testRouteResult = testRoute(route)
@@ -111,7 +112,7 @@ public void shouldSetTheSession_UsingHeaders() {
111112
@Test
112113
public void shouldReadAnOptionalSessionWhenTheSessionIsSet_UsingCookies() {
113114
// given
114-
final Route route = createRoute(CookieST$.MODULE$);
115+
final Route route = createRoute(CookieST);
115116

116117
// when
117118
TestRouteResult setRouteResult = testRoute(route)
@@ -134,7 +135,7 @@ public void shouldReadAnOptionalSessionWhenTheSessionIsSet_UsingCookies() {
134135
@Test
135136
public void shouldReadAnOptionalSessionWhenTheSessionIsSet_UsingHeaders() {
136137
// given
137-
final Route route = createRoute(HeaderST$.MODULE$);
138+
final Route route = createRoute(HeaderST);
138139

139140
// when
140141
TestRouteResult setRouteResult = testRoute(route)
@@ -156,7 +157,7 @@ public void shouldReadAnOptionalSessionWhenTheSessionIsSet_UsingHeaders() {
156157
@Test
157158
public void shouldReadAnOptionalSessionWhenTheSessionIsNotSet_UsingCookies() {
158159
// given
159-
final Route route = createRoute(CookieST$.MODULE$);
160+
final Route route = createRoute(CookieST);
160161

161162
// when
162163
TestRouteResult getOptRouteResult = testRoute(route)
@@ -171,7 +172,7 @@ public void shouldReadAnOptionalSessionWhenTheSessionIsNotSet_UsingCookies() {
171172
@Test
172173
public void shouldReadAnOptionalSessionWhenTheSessionIsNotSet_UsingHeaders() {
173174
// given
174-
final Route route = createRoute(HeaderST$.MODULE$);
175+
final Route route = createRoute(HeaderST);
175176

176177
// when
177178
TestRouteResult getOptRouteResult = testRoute(route)
@@ -186,7 +187,7 @@ public void shouldReadAnOptionalSessionWhenTheSessionIsNotSet_UsingHeaders() {
186187
@Test
187188
public void shouldReadARequiredSessionWhenTheSessionIsSet_UsingCookies() {
188189
// given
189-
final Route route = createRoute(CookieST$.MODULE$);
190+
final Route route = createRoute(CookieST);
190191

191192
// when
192193
TestRouteResult setRouteResult = testRoute(route)
@@ -209,7 +210,7 @@ public void shouldReadARequiredSessionWhenTheSessionIsSet_UsingCookies() {
209210
@Test
210211
public void shouldReadARequiredSessionWhenTheSessionIsSet_UsingHeaders() {
211212
// given
212-
final Route route = createRoute(HeaderST$.MODULE$);
213+
final Route route = createRoute(HeaderST);
213214

214215
// when
215216
TestRouteResult setRouteResult = testRoute(route)
@@ -232,7 +233,7 @@ public void shouldReadARequiredSessionWhenTheSessionIsSet_UsingHeaders() {
232233
@Test
233234
public void shouldInvalidateASession_UsingCookies() {
234235
// given
235-
final Route route = createRoute(CookieST$.MODULE$);
236+
final Route route = createRoute(CookieST);
236237

237238
// when
238239
TestRouteResult setRouteResult = testRoute(route)
@@ -258,7 +259,7 @@ public void shouldInvalidateASession_UsingCookies() {
258259
@Test
259260
public void shouldInvalidateASession_UsingHeaders() {
260261
// given
261-
final Route route = createRoute(HeaderST$.MODULE$);
262+
final Route route = createRoute(HeaderST);
262263

263264
// when
264265
TestRouteResult setRouteResult = testRoute(route)
@@ -284,7 +285,7 @@ public void shouldInvalidateASession_UsingHeaders() {
284285
@Test
285286
public void shouldRejectTheRequestIfTheSessionIsNotSet_UsingCookies() {
286287
// given
287-
final Route route = createRoute(CookieST$.MODULE$);
288+
final Route route = createRoute(CookieST);
288289

289290
// when
290291
TestRouteResult getOptRouteResult = testRoute(route)
@@ -298,7 +299,7 @@ public void shouldRejectTheRequestIfTheSessionIsNotSet_UsingCookies() {
298299
@Test
299300
public void shouldRejectTheRequestIfTheSessionIsNotSet_UsingHeaders() {
300301
// given
301-
final Route route = createRoute(HeaderST$.MODULE$);
302+
final Route route = createRoute(HeaderST);
302303

303304
// when
304305
TestRouteResult getReqRouteResult = testRoute(route)
@@ -313,7 +314,7 @@ public void shouldRejectTheRequestIfTheSessionIsNotSet_UsingHeaders() {
313314
@Test
314315
public void shouldRejectTheRequestIfTheSessionIsInvalid_UsingCookies() {
315316
// given
316-
final Route route = createRoute(CookieST$.MODULE$);
317+
final Route route = createRoute(CookieST);
317318

318319
// when
319320
TestRouteResult getOptRouteResult = testRoute(route)
@@ -329,7 +330,7 @@ public void shouldRejectTheRequestIfTheSessionIsInvalid_UsingCookies() {
329330
@Test
330331
public void shouldRejectTheRequestIfTheSessionIsInvalid_UsingHeaders() {
331332
// given
332-
final Route route = createRoute(HeaderST$.MODULE$);
333+
final Route route = createRoute(HeaderST);
333334

334335
// when
335336
TestRouteResult getOptRouteResult = testRoute(route)
@@ -344,9 +345,9 @@ public void shouldRejectTheRequestIfTheSessionIsInvalid_UsingHeaders() {
344345

345346
@Test
346347
public void shouldTouchTheSession_UsingCookies() {
347-
final Route route_fixed = createRoute(CookieST$.MODULE$, getExpiring60SessionManagerWithFixedTime());
348-
final Route route_fixed_plus30s = createRoute(CookieST$.MODULE$, getExpiring60Plus30SessionManagerWithFixedTime());
349-
final Route route_fixed_plus70s = createRoute(CookieST$.MODULE$, getExpiring60Plus70SessionManagerWithFixedTime());
348+
final Route route_fixed = createRoute(CookieST, getExpiring60SessionManagerWithFixedTime());
349+
final Route route_fixed_plus30s = createRoute(CookieST, getExpiring60Plus30SessionManagerWithFixedTime());
350+
final Route route_fixed_plus70s = createRoute(CookieST, getExpiring60Plus70SessionManagerWithFixedTime());
350351

351352
TestRouteResult setRouteResult = testRoute(route_fixed)
352353
.run(HttpRequest.GET("/set"));
@@ -385,9 +386,9 @@ public void shouldTouchTheSession_UsingCookies() {
385386

386387
@Test
387388
public void shouldTouchTheSession_KeepingTheRefreshTokenIntact_UsingHeaders() {
388-
final Route route_fixed = createRoute(HeaderST$.MODULE$, getExpiring60SessionManagerWithFixedTime());
389-
final Route route_fixed_plus30s = createRoute(HeaderST$.MODULE$, getExpiring60Plus30SessionManagerWithFixedTime());
390-
final Route route_fixed_plus70s = createRoute(HeaderST$.MODULE$, getExpiring60Plus70SessionManagerWithFixedTime());
389+
final Route route_fixed = createRoute(HeaderST, getExpiring60SessionManagerWithFixedTime());
390+
final Route route_fixed_plus30s = createRoute(HeaderST, getExpiring60Plus30SessionManagerWithFixedTime());
391+
final Route route_fixed_plus70s = createRoute(HeaderST, getExpiring60Plus70SessionManagerWithFixedTime());
391392

392393
TestRouteResult setRouteResult = testRoute(route_fixed)
393394
.run(HttpRequest.GET("/set"));

0 commit comments

Comments
 (0)