Remove deprecated code in spring-session-data-redis

Author: vpavic

spring-session-data-redis/src/main/java/org/springframework/session/data/redis/ReactiveRedisOperationsSessionRepository.java

@@ -76,17 +76,6 @@ public void setDefaultMaxInactiveInterval(Duration defaultMaxInactiveInterval) {
 		this.defaultMaxInactiveInterval = defaultMaxInactiveInterval;
 	}
 
-	/**
-	 * Set the key namespace.
-	 * @param keyNamespace the key namespace
-	 * @deprecated since 2.4.0 in favor of {@link #setRedisKeyNamespace(String)}
-	 */
-	@Deprecated
-	public void setKeyNamespace(String keyNamespace) {
-		Assert.hasText(keyNamespace, "keyNamespace must not be empty");
-		this.keyNamespace = keyNamespace;
-	}
-
 	/**
 	 * Set the Redis key namespace.
 	 * @param namespace the Redis key namespace

spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisFlushMode.java

@@ -31,7 +31,6 @@
 import org.springframework.session.Session;
 import org.springframework.session.SessionRepository;
 import org.springframework.session.config.annotation.web.http.EnableSpringHttpSession;
-import org.springframework.session.data.redis.RedisFlushMode;
 import org.springframework.session.data.redis.RedisIndexedSessionRepository;
 import org.springframework.session.data.redis.RedisSessionRepository;
 import org.springframework.session.web.http.SessionRepositoryFilter;
@@ -89,20 +88,6 @@
 	 */
 	String redisNamespace() default RedisIndexedSessionRepository.DEFAULT_NAMESPACE;
 
-	/**
-	 * Flush mode for the Redis sessions. The default is {@code ON_SAVE} which only
-	 * updates the backing Redis when {@link SessionRepository#save(Session)} is invoked.
-	 * In a web environment this happens just before the HTTP response is committed.
-	 * <p>
-	 * Setting the value to {@code IMMEDIATE} will ensure that the any updates to the
-	 * Session are immediately written to the Redis instance.
-	 * @return the {@link RedisFlushMode} to use
-	 * @since 1.1
-	 * @deprecated since 2.2.0 in favor of {@link #flushMode()}
-	 */
-	@Deprecated
-	RedisFlushMode redisFlushMode() default RedisFlushMode.ON_SAVE;
-
 	/**
 	 * Flush mode for the Redis sessions. The default is {@code ON_SAVE} which only
 	 * updates the backing Redis when {@link SessionRepository#save(Session)} is invoked.

spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisOperationsSessionRepository.java

@@ -40,7 +40,6 @@
 import org.springframework.session.SaveMode;
 import org.springframework.session.config.SessionRepositoryCustomizer;
 import org.springframework.session.config.annotation.web.http.SpringHttpSessionConfiguration;
-import org.springframework.session.data.redis.RedisFlushMode;
 import org.springframework.session.data.redis.RedisSessionRepository;
 import org.springframework.session.data.redis.config.annotation.SpringSessionRedisConnectionFactory;
 import org.springframework.session.web.http.SessionRepositoryFilter;
@@ -104,12 +103,6 @@ public void setRedisNamespace(String namespace) {
 		this.redisNamespace = namespace;
 	}
 
-	@Deprecated
-	public void setRedisFlushMode(RedisFlushMode redisFlushMode) {
-		Assert.notNull(redisFlushMode, "redisFlushMode cannot be null");
-		setFlushMode(redisFlushMode.getFlushMode());
-	}
-
 	public void setFlushMode(FlushMode flushMode) {
 		Assert.notNull(flushMode, "flushMode cannot be null");
 		this.flushMode = flushMode;
@@ -153,7 +146,6 @@ public void setEmbeddedValueResolver(StringValueResolver resolver) {
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		Map<String, Object> attributeMap = importMetadata
 				.getAnnotationAttributes(EnableRedisHttpSession.class.getName());
@@ -163,12 +155,7 @@ public void setImportMetadata(AnnotationMetadata importMetadata) {
 		if (StringUtils.hasText(redisNamespaceValue)) {
 			this.redisNamespace = this.embeddedValueResolver.resolveStringValue(redisNamespaceValue);
 		}
-		FlushMode flushMode = attributes.getEnum("flushMode");
-		RedisFlushMode redisFlushMode = attributes.getEnum("redisFlushMode");
-		if (flushMode == FlushMode.ON_SAVE && redisFlushMode != RedisFlushMode.ON_SAVE) {
-			flushMode = redisFlushMode.getFlushMode();
-		}
-		this.flushMode = flushMode;
+		this.flushMode = attributes.getEnum("flushMode");
 		this.saveMode = attributes.getEnum("saveMode");
 	}
 

spring-session-data-redis/src/main/java/org/springframework/session/data/redis/RedisSessionRepository.java

@@ -57,7 +57,6 @@
 import org.springframework.session.Session;
 import org.springframework.session.config.SessionRepositoryCustomizer;
 import org.springframework.session.config.annotation.web.http.SpringHttpSessionConfiguration;
-import org.springframework.session.data.redis.RedisFlushMode;
 import org.springframework.session.data.redis.RedisIndexedSessionRepository;
 import org.springframework.session.data.redis.config.ConfigureNotifyKeyspaceEventsAction;
 import org.springframework.session.data.redis.config.ConfigureRedisAction;
@@ -168,12 +167,6 @@ public void setRedisNamespace(String namespace) {
 		this.redisNamespace = namespace;
 	}
 
-	@Deprecated
-	public void setRedisFlushMode(RedisFlushMode redisFlushMode) {
-		Assert.notNull(redisFlushMode, "redisFlushMode cannot be null");
-		setFlushMode(redisFlushMode.getFlushMode());
-	}
-
 	public void setFlushMode(FlushMode flushMode) {
 		Assert.notNull(flushMode, "flushMode cannot be null");
 		this.flushMode = flushMode;
@@ -253,7 +246,6 @@ public void setEmbeddedValueResolver(StringValueResolver resolver) {
 	}
 
 	@Override
-	@SuppressWarnings("deprecation")
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		Map<String, Object> attributeMap = importMetadata
 				.getAnnotationAttributes(EnableRedisHttpSession.class.getName());
@@ -263,12 +255,7 @@ public void setImportMetadata(AnnotationMetadata importMetadata) {
 		if (StringUtils.hasText(redisNamespaceValue)) {
 			this.redisNamespace = this.embeddedValueResolver.resolveStringValue(redisNamespaceValue);
 		}
-		FlushMode flushMode = attributes.getEnum("flushMode");
-		RedisFlushMode redisFlushMode = attributes.getEnum("redisFlushMode");
-		if (flushMode == FlushMode.ON_SAVE && redisFlushMode != RedisFlushMode.ON_SAVE) {
-			flushMode = redisFlushMode.getFlushMode();
-		}
-		this.flushMode = flushMode;
+		this.flushMode = attributes.getEnum("flushMode");
 		this.saveMode = attributes.getEnum("saveMode");
 	}
 

spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisHttpSession.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,12 +26,9 @@
 import org.springframework.context.annotation.Import;
 import org.springframework.data.redis.connection.ReactiveRedisConnectionFactory;
 import org.springframework.session.MapSession;
-import org.springframework.session.ReactiveSessionRepository;
 import org.springframework.session.SaveMode;
-import org.springframework.session.Session;
 import org.springframework.session.config.annotation.web.server.EnableSpringWebSession;
 import org.springframework.session.data.redis.ReactiveRedisSessionRepository;
-import org.springframework.session.data.redis.RedisFlushMode;
 import org.springframework.web.server.session.WebSessionManager;
 
 /**
@@ -86,20 +83,6 @@
 	 */
 	String redisNamespace() default ReactiveRedisSessionRepository.DEFAULT_NAMESPACE;
 
-	/**
-	 * Flush mode for the Redis sessions. The default is {@code ON_SAVE} which only
-	 * updates the backing Redis when {@link ReactiveSessionRepository#save(Session)} is
-	 * invoked. In a web environment this happens just before the HTTP response is
-	 * committed.
-	 * <p>
-	 * Setting the value to {@code IMMEDIATE} will ensure that the any updates to the
-	 * Session are immediately written to the Redis instance.
-	 * @return the {@link RedisFlushMode} to use
-	 * @deprecated since 2.2.0 as support {@code IMMEDIATE} is removed
-	 */
-	@Deprecated
-	RedisFlushMode redisFlushMode() default RedisFlushMode.ON_SAVE;
-
 	/**
 	 * Save mode for the session. The default is {@link SaveMode#ON_SET_ATTRIBUTE}, which
 	 * only saves changes made to session.

spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/http/RedisHttpSessionConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,9 +41,7 @@
 import org.springframework.session.config.ReactiveSessionRepositoryCustomizer;
 import org.springframework.session.config.annotation.web.server.SpringWebSessionConfiguration;
 import org.springframework.session.data.redis.ReactiveRedisSessionRepository;
-import org.springframework.session.data.redis.RedisFlushMode;
 import org.springframework.session.data.redis.config.annotation.SpringSessionRedisConnectionFactory;
-import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;
 import org.springframework.util.StringValueResolver;
 import org.springframework.web.server.session.WebSessionManager;
@@ -99,11 +97,6 @@ public void setRedisNamespace(String namespace) {
 		this.redisNamespace = namespace;
 	}
 
-	@Deprecated
-	public void setRedisFlushMode(RedisFlushMode redisFlushMode) {
-		Assert.notNull(redisFlushMode, "redisFlushMode cannot be null");
-	}
-
 	public void setSaveMode(SaveMode saveMode) {
 		this.saveMode = saveMode;
 	}