From d4e73cfef6731cd9ceccbaa525692a920099aa45 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Tue, 20 Oct 2020 09:52:47 +0300
Subject: [PATCH] Spring Session implementation is deprecated now

---
 .../ReactiveRedissonSessionRepository.java    |  4 +++-
 .../session/RedissonSessionRepository.java    |  4 +++-
 .../config/EnableRedissonHttpSession.java     | 23 +++----------------
 .../config/EnableRedissonWebSession.java      | 21 ++---------------
 .../RedissonHttpSessionConfiguration.java     |  7 ++----
 .../RedissonWebSessionConfiguration.java      |  7 ++----
 6 files changed, 15 insertions(+), 51 deletions(-)

diff --git a/redisson/src/main/java/org/redisson/spring/session/ReactiveRedissonSessionRepository.java b/redisson/src/main/java/org/redisson/spring/session/ReactiveRedissonSessionRepository.java
index 3415dec6f..ebaab9a3f 100644
--- a/redisson/src/main/java/org/redisson/spring/session/ReactiveRedissonSessionRepository.java
+++ b/redisson/src/main/java/org/redisson/spring/session/ReactiveRedissonSessionRepository.java
@@ -23,10 +23,12 @@ import org.springframework.session.ReactiveSessionRepository;
 import reactor.core.publisher.Mono;
 
 /**
- * 
+ * Deprecated. Use spring-session implementation based on Redisson Redis Data module
+ *
  * @author Nikita Koksharov
  *
  */
+@Deprecated
 public class ReactiveRedissonSessionRepository implements ReactiveSessionRepository<RedissonSession> {
 
     private final RedissonSessionRepository repository;
diff --git a/redisson/src/main/java/org/redisson/spring/session/RedissonSessionRepository.java b/redisson/src/main/java/org/redisson/spring/session/RedissonSessionRepository.java
index b96abe67b..94c852d14 100644
--- a/redisson/src/main/java/org/redisson/spring/session/RedissonSessionRepository.java
+++ b/redisson/src/main/java/org/redisson/spring/session/RedissonSessionRepository.java
@@ -51,10 +51,12 @@ import org.springframework.session.events.SessionExpiredEvent;
 import org.springframework.util.StringUtils;
 
 /**
- * 
+ * Deprecated. Use spring-session implementation based on Redisson Redis Data module
+ *
  * @author Nikita Koksharov
  *
  */
+@Deprecated
 public class RedissonSessionRepository implements FindByIndexNameSessionRepository<RedissonSessionRepository.RedissonSession>, 
                                                     PatternMessageListener<String> {
 
diff --git a/redisson/src/main/java/org/redisson/spring/session/config/EnableRedissonHttpSession.java b/redisson/src/main/java/org/redisson/spring/session/config/EnableRedissonHttpSession.java
index 938b93eb7..a13e3605b 100644
--- a/redisson/src/main/java/org/redisson/spring/session/config/EnableRedissonHttpSession.java
+++ b/redisson/src/main/java/org/redisson/spring/session/config/EnableRedissonHttpSession.java
@@ -26,26 +26,8 @@ import org.springframework.session.MapSession;
 import org.springframework.session.web.http.SessionRepositoryFilter;
 
 /**
- * Enables Redisson's Spring Session implementation backed by Redis and
- * exposes {@link SessionRepositoryFilter} as a bean named "springSessionRepositoryFilter".
- * <p>
- * Redisson instance should be registered as bean in application context.
- * Usage example:
- * <pre>
- * <code>
- * {@literal @Configuration}
- * {@literal EnableRedissonHttpSession}
- * public class RedissonHttpSessionConfig {
- *    
- *    {@literal @Bean}
- *    public RedissonClient redisson() {
- *        return Redisson.create();
- *    }
- *    
- * }
- * </code>
- * </pre>
- * 
+ * Deprecated. Use spring-session implementation based on Redisson Redis Data module
+ *
  * @author Nikita Koksharov
  *
  */
@@ -53,6 +35,7 @@ import org.springframework.session.web.http.SessionRepositoryFilter;
 @Target(ElementType.TYPE)
 @Import(RedissonHttpSessionConfiguration.class)
 @Configuration
+@Deprecated
 public @interface EnableRedissonHttpSession {
 
     int maxInactiveIntervalInSeconds() default MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS;
diff --git a/redisson/src/main/java/org/redisson/spring/session/config/EnableRedissonWebSession.java b/redisson/src/main/java/org/redisson/spring/session/config/EnableRedissonWebSession.java
index 1187a2de2..b80cb7880 100644
--- a/redisson/src/main/java/org/redisson/spring/session/config/EnableRedissonWebSession.java
+++ b/redisson/src/main/java/org/redisson/spring/session/config/EnableRedissonWebSession.java
@@ -26,25 +26,7 @@ import org.springframework.session.MapSession;
 import org.springframework.web.server.session.WebSessionManager;
 
 /**
- * Enables Redisson's Spring Session implementation backed by Redis and
- * exposes {@link WebSessionManager} as a bean named "webSessionManager".
- * <p>
- * Redisson instance should be registered as bean in application context.
- * Usage example:
- * <pre>
- * <code>
- * {@literal @Configuration}
- * {@literal EnableRedissonHttpSession}
- * public class RedissonHttpSessionConfig {
- *    
- *    {@literal @Bean}
- *    public RedissonClient redisson() {
- *        return Redisson.create();
- *    }
- *    
- * }
- * </code>
- * </pre>
+ * Deprecated. Use spring-session implementation based on Redisson Redis Data module
  * 
  * @author Nikita Koksharov
  *
@@ -53,6 +35,7 @@ import org.springframework.web.server.session.WebSessionManager;
 @Target(ElementType.TYPE)
 @Import(RedissonWebSessionConfiguration.class)
 @Configuration
+@Deprecated
 public @interface EnableRedissonWebSession {
 
     int maxInactiveIntervalInSeconds() default MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS;
diff --git a/redisson/src/main/java/org/redisson/spring/session/config/RedissonHttpSessionConfiguration.java b/redisson/src/main/java/org/redisson/spring/session/config/RedissonHttpSessionConfiguration.java
index cad3747da..a7d07ea4c 100644
--- a/redisson/src/main/java/org/redisson/spring/session/config/RedissonHttpSessionConfiguration.java
+++ b/redisson/src/main/java/org/redisson/spring/session/config/RedissonHttpSessionConfiguration.java
@@ -29,16 +29,13 @@ import org.springframework.session.config.annotation.web.http.SpringHttpSessionC
 import org.springframework.session.web.http.SessionRepositoryFilter;
 
 /**
- * Exposes the {@link SessionRepositoryFilter} as the bean
- * named "springSessionRepositoryFilter".
- * <p>
- * Redisson instance should be registered as bean 
- * in application context.
+ * Deprecated. Use spring-session implementation based on Redisson Redis Data module
  * 
  * @author Nikita Koksharov
  *
  */
 @Configuration
+@Deprecated
 public class RedissonHttpSessionConfiguration extends SpringHttpSessionConfiguration implements ImportAware {
 
     private Integer maxInactiveIntervalInSeconds;
diff --git a/redisson/src/main/java/org/redisson/spring/session/config/RedissonWebSessionConfiguration.java b/redisson/src/main/java/org/redisson/spring/session/config/RedissonWebSessionConfiguration.java
index 8eddc7714..2e84ec4f0 100644
--- a/redisson/src/main/java/org/redisson/spring/session/config/RedissonWebSessionConfiguration.java
+++ b/redisson/src/main/java/org/redisson/spring/session/config/RedissonWebSessionConfiguration.java
@@ -29,16 +29,13 @@ import org.springframework.session.config.annotation.web.server.SpringWebSession
 import org.springframework.web.server.session.WebSessionManager;
 
 /**
- * Exposes the {@link WebSessionManager} as the bean
- * named "webSessionManager".
- * <p>
- * Redisson instance should be registered as bean 
- * in application context.
+ * Deprecated. Use spring-session implementation based on Redisson Redis Data module
  * 
  * @author Nikita Koksharov
  *
  */
 @Configuration
+@Deprecated
 public class RedissonWebSessionConfiguration extends SpringWebSessionConfiguration implements ImportAware {
 
     private Integer maxInactiveIntervalInSeconds;