From b321ff02f081c7e1c42e3db3b65678571fb09597 Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Fri, 23 Jun 2017 18:48:30 +0200 Subject: [PATCH] Revert "SessionRepository.save returns S" See gh-809 --- .../java/org/springframework/session/MapSessionRepository.java | 3 +-- .../java/org/springframework/session/SessionRepository.java | 2 +- .../session/data/redis/RedisOperationsSessionRepository.java | 3 +-- .../session/hazelcast/HazelcastSessionRepository.java | 3 +-- .../session/jdbc/JdbcOperationsSessionRepository.java | 3 +-- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/spring-session-core/src/main/java/org/springframework/session/MapSessionRepository.java b/spring-session-core/src/main/java/org/springframework/session/MapSessionRepository.java index 71bfe759..086ddcb5 100644 --- a/spring-session-core/src/main/java/org/springframework/session/MapSessionRepository.java +++ b/spring-session-core/src/main/java/org/springframework/session/MapSessionRepository.java @@ -76,9 +76,8 @@ public class MapSessionRepository implements SessionRepository { this.defaultMaxInactiveInterval = Integer.valueOf(defaultMaxInactiveInterval); } - public Session save(Session session) { + public void save(Session session) { this.sessions.put(session.getId(), new MapSession(session)); - return session; } public Session findById(String id) { diff --git a/spring-session-core/src/main/java/org/springframework/session/SessionRepository.java b/spring-session-core/src/main/java/org/springframework/session/SessionRepository.java index b2233925..b8d52425 100644 --- a/spring-session-core/src/main/java/org/springframework/session/SessionRepository.java +++ b/spring-session-core/src/main/java/org/springframework/session/SessionRepository.java @@ -52,7 +52,7 @@ public interface SessionRepository { * * @param session the {@link Session} to save */ - S save(S session); + void save(S session); /** * Gets the {@link Session} by the {@link Session#getId()} or null if no diff --git a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java index eb4a1449..b5e73509 100644 --- a/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java +++ b/spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java @@ -386,14 +386,13 @@ public class RedisOperationsSessionRepository implements this.redisFlushMode = redisFlushMode; } - public RedisSession save(RedisSession session) { + public void save(RedisSession session) { session.saveDelta(); if (session.isNew()) { String sessionCreatedKey = getSessionCreatedChannel(session.getId()); this.sessionRedisOperations.convertAndSend(sessionCreatedKey, session.delta); session.setNew(false); } - return session; } @Scheduled(cron = "${spring.session.cleanup.cron.expression:0 * * * * *}") diff --git a/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java b/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java index 55bec963..f9254e40 100644 --- a/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java +++ b/spring-session-hazelcast/src/main/java/org/springframework/session/hazelcast/HazelcastSessionRepository.java @@ -202,13 +202,12 @@ public class HazelcastSessionRepository implements return result; } - public HazelcastSession save(HazelcastSession session) { + public void save(HazelcastSession session) { if (session.isChanged()) { this.sessions.put(session.getId(), session.getDelegate(), session.getMaxInactiveInterval().getSeconds(), TimeUnit.SECONDS); session.markUnchanged(); } - return session; } public HazelcastSession findById(String id) { diff --git a/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java b/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java index b3bc40b0..b79b40d6 100644 --- a/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java +++ b/spring-session-jdbc/src/main/java/org/springframework/session/jdbc/JdbcOperationsSessionRepository.java @@ -371,7 +371,7 @@ public class JdbcOperationsSessionRepository implements return session; } - public JdbcSession save(final JdbcSession session) { + public void save(final JdbcSession session) { if (session.isNew()) { this.transactionOperations.execute(new TransactionCallbackWithoutResult() { @@ -458,7 +458,6 @@ public class JdbcOperationsSessionRepository implements }); } session.clearChangeFlags(); - return session; } public JdbcSession findById(final String id) {