Update Gradle Enterprise plugins

Closes gh-2264

.github/workflows/antora-generate.yml

@@ -1,6 +1,7 @@
 name: Generate Antora Files and Request Build
 
 on:
+  workflow_dispatch:  # Manual trigger
   push:
     branches-ignore:
       - 'gh-pages'
@@ -14,12 +15,6 @@ jobs:
     steps:
       - name: Checkout Source
         uses: actions/checkout@v2
-      - name: Set up JDK 17
-        uses: actions/setup-java@v2
-        with:
-          java-version: '17'
-          distribution: 'adopt'
-          cache: gradle
       - name: Generate antora.yml
         run: ./gradlew :spring-session-docs:generateAntora
       - name: Extract Branch Name

.github/workflows/continuous-integration-workflow.yml

@@ -20,7 +20,7 @@ jobs:
     if: github.repository == 'spring-projects/spring-session'
     strategy:
       matrix:
-        jdk: [17]
+        jdk: [8, 11]
       fail-fast: false
     steps:
       - uses: actions/checkout@v2
@@ -53,7 +53,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: '17'
+          java-version: '8'
       - name: Setup gradle user name
         run: |
           mkdir -p ~/.gradle
@@ -81,7 +81,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: '17'
+          java-version: '8'
       - name: Setup gradle user name
         run: |
           mkdir -p ~/.gradle

.github/workflows/deploy-reference.yml

@@ -13,10 +13,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 11
         uses: actions/setup-java@v2
         with:
-          java-version: '17'
+          java-version: '11'
           distribution: 'adopt'
           cache: gradle
       - name: Validate Gradle wrapper

.github/workflows/pr-build-workflow.yml

@@ -9,7 +9,7 @@ jobs:
     if: github.repository == 'spring-projects/spring-session'
     strategy:
       matrix:
-        jdk: [17]
+        jdk: [8, 11]
       fail-fast: false
     steps:
       - uses: actions/checkout@v2

.gitignore

@@ -14,5 +14,3 @@ out
 !etc/eclipse/.checkstyle
 !**/src/**/build
 .DS_Store
-spring-session-docs/package-lock.json
-spring-session-docs/node_modules/

.sdkmanrc

@@ -3,4 +3,4 @@
 # See https://sdkman.io/usage#config
 # A summary is to add the following to ~/.sdkman/etc/config
 # sdkman_auto_env=true
-java=17.0.2-tem
+java=8.0.332-zulu

CONTRIBUTING.adoc

@@ -25,6 +25,13 @@ If you are reporting a bug, please help to speed up problem diagnosis by providi
 information as possible. Ideally, that would include a small sample project that
 reproduces the problem.
 
+== Create your branch from the oldest maintenance branch
+
+Create your topic branch to be submitted as a pull request from the oldest impacted and supported maintenance branch.
+You can find the supported versions by looking at the https://github.com/spring-projects/spring-session/milestones[milestones page].
+Switch to a branch named `<major>.<minor>.x` from the smallest milestone in the format of `<major>.<minor>.<patch>(-<prerelease>)`.
+The spring team will ensure the code gets merged forward into additional branches.
+
 
 == Sign the Contributor License Agreement
 If you have not previously done so, please fill out and

README.adoc

@@ -25,7 +25,7 @@ Additional Spring Session modules can be found in the https://github.com/spring-
 
 == Getting Started
 
-We recommend you visit the https://docs.spring.io/spring-session/docs/current/reference/html5/#samples[Spring Session Reference] and look through the "Samples and Guides" section to see which one best suits your needs.
+We recommend you visit the https://docs.spring.io/spring-session/reference/index.html[Spring Session Reference] and look through the "Samples and Guides" section to see which one best suits your needs.
 
 == Samples
 

RELEASE.adoc

@@ -18,7 +18,7 @@ You can manually check at https://github.com/spring-projects/spring-session/mile
 
 == 3. Update Release Version
 
-Update the version number in `gradle.properties` for the release, for example `3.0.0-M1`, `3.0.0-RC1`, `3.0.4`
+Update the version number in `gradle.properties` for the release, for example `2.7.0-M1`, `2.7.0-RC1`, `2.7.3`
 
 == 4. Update Antora Version
 
@@ -26,9 +26,9 @@ You will need to update the antora.yml version.
 
 For milestone / release candidate releases you should follow this format:
 ----
-version: '3.0.0-RC1'
+version: '2.7.0-RC1'
 prerelease: 'true'
-display_version: '3.0.0-RC1'
+display_version: '2.7.0-RC1'
 ----
 
 == 5. Build Locally
@@ -50,8 +50,8 @@ Wait for the artifact to appear in https://repo1.maven.org/maven2/org/springfram
 Tag the release and then push the tag
 
 ....
-git tag 3.0.0-RC1
-git push origin 3.0.0-RC1
+git tag 2.7.0-RC1
+git push origin 2.7.0-RC1
 ....
 
 == 8. Update to Next Development Version
@@ -76,7 +76,7 @@ java -jar github-changelog-generator.jar \
     $MILESTONE release-notes
 ....
 
-Note 1: `+$MILESTONE+` is something like `+3.0.4+` or `+3.0.0-M1+`. +
+Note 1: `+$MILESTONE+` is something like `+2.7.1+` or `+2.7.0-M1+`. +
 Note 2: This will create a file on your filesystem
 called `+release-notes+`.
 

build.gradle

@@ -4,7 +4,7 @@ buildscript {
 		snapshotBuild = version.endsWith('SNAPSHOT')
 		milestoneBuild = !(releaseBuild || snapshotBuild)
 
-		springBootVersion = '3.0.0-SNAPSHOT'
+		springBootVersion = '2.7.8'
 	}
 
 	repositories {
@@ -35,7 +35,7 @@ subprojects {
 	apply plugin: 'io.spring.javaformat'
 
 	plugins.withType(JavaPlugin) {
-		sourceCompatibility = JavaVersion.VERSION_17
+		sourceCompatibility = JavaVersion.VERSION_1_8
 	}
 
 	tasks.withType(Test) {
@@ -45,6 +45,4 @@ subprojects {
 
 nohttp {
     source.exclude "buildSrc/build/**"
-	source.exclude "spring-session-docs/.gradle/nodejs/**"
-	source.exclude "spring-session-docs/modules/ROOT/examples/**/build/**"
 }

buildSrc/build.gradle

@@ -4,7 +4,7 @@ plugins {
     id "groovy"
 }
 
-sourceCompatibility = JavaVersion.VERSION_11
+sourceCompatibility = 1.8
 
 repositories {
     jcenter()
@@ -62,11 +62,11 @@ dependencies {
     implementation 'com.apollographql.apollo:apollo-runtime:2.4.5'
     implementation 'com.github.ben-manes:gradle-versions-plugin:0.38.0'
     implementation 'com.github.spullara.mustache.java:compiler:0.9.10'
-    implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.34'
+    implementation 'io.spring.javaformat:spring-javaformat-gradle-plugin:0.0.15'
     implementation 'io.spring.nohttp:nohttp-gradle:0.0.9'
-    implementation 'net.sourceforge.htmlunit:htmlunit:2.37.0'
+    implementation 'net.sourceforge.htmlunit:htmlunit:2.55.0'
     implementation 'org.hidetake:gradle-ssh-plugin:2.10.1'
-    implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.24.20'
+    implementation 'org.jfrog.buildinfo:build-info-extractor-gradle:4.29.0'
     implementation 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:2.7.1'
 
     testImplementation platform('org.junit:junit-bom:5.8.1')

buildSrc/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

buildSrc/src/main/groovy/io/spring/gradle/convention/AbstractSpringJavaPlugin.groovy

@@ -35,7 +35,6 @@ public abstract class AbstractSpringJavaPlugin implements Plugin<Project> {
 
 	@Override
 	public final void apply(Project project) {
-		initialPlugins(project);
 		PluginManager pluginManager = project.getPluginManager();
 		pluginManager.apply(JavaPlugin.class);
 		pluginManager.apply(ManagementConfigurationPlugin.class)
@@ -70,7 +69,5 @@ public abstract class AbstractSpringJavaPlugin implements Plugin<Project> {
 		additionalPlugins(project);
 	}
 
-	protected void initialPlugins(Project project) {}
-
 	protected abstract void additionalPlugins(Project project);
 }

buildSrc/src/main/groovy/io/spring/gradle/convention/ArtifactoryPlugin.groovy

@@ -18,6 +18,7 @@ package io.spring.gradle.convention
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
+import org.gradle.api.publish.maven.plugins.MavenPublishPlugin
 
 class ArtifactoryPlugin implements Plugin<Project> {
 
@@ -37,8 +38,14 @@ class ArtifactoryPlugin implements Plugin<Project> {
 						password = artifactoryPassword
 					}
 				}
-				defaults {
-					publications('mavenJava')
+			}
+		}
+		project.plugins.withType(MavenPublishPlugin) {
+			project.artifactory {
+				publish {
+					defaults {
+						publications('mavenJava')
+					}
 				}
 			}
 		}

buildSrc/src/main/groovy/io/spring/gradle/convention/JacocoPlugin.groovy

@@ -34,7 +34,7 @@ class JacocoPlugin implements Plugin<Project> {
 			project.tasks.check.dependsOn project.tasks.jacocoTestReport
 
 			project.jacoco {
-				toolVersion = '0.8.7'
+				toolVersion = '0.8.2'
 			}
 		}
 	}

buildSrc/src/main/groovy/io/spring/gradle/convention/RootProjectPlugin.groovy

@@ -32,6 +32,7 @@ class RootProjectPlugin implements Plugin<Project> {
 		pluginManager.apply(SchemaPlugin)
 		pluginManager.apply(NoHttpPlugin)
 		pluginManager.apply(SpringNexusPublishPlugin)
+		pluginManager.apply(ArtifactoryPlugin)
 		pluginManager.apply("org.sonarqube")
 
 		project.repositories.mavenCentral()

buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSamplePlugin.groovy

@@ -30,19 +30,4 @@ public class SpringSamplePlugin extends AbstractSpringJavaPlugin {
             project.sonarqube.skipProject = true
         }
     }
-
-	@Override
-	protected void initialPlugins(Project project) {
-		if (project.hasProperty('springBootVersion')) {
-			String springBootVersion = project.springBootVersion
-
-			if (Utils.isSnapshot(springBootVersion)) {
-				project.ext.forceMavenRepositories = 'snapshot'
-			}
-			else if (Utils.isMilestone(springBootVersion)) {
-				project.ext.forceMavenRepositories = 'milestone'
-			}
-		}
-
-	}
 }

buildSrc/src/main/groovy/io/spring/gradle/convention/SpringSampleWarPlugin.groovy

@@ -36,7 +36,7 @@ public class SpringSampleWarPlugin extends SpringSamplePlugin {
         pluginManager.apply("org.gretty");
 
         project.gretty {
-            servletContainer = 'tomcat10'
+            servletContainer = 'tomcat85'
             contextPath = '/'
             fileLogEnabled = false
         }

buildSrc/src/main/groovy/io/spring/gradle/convention/Utils.groovy

@@ -14,29 +14,16 @@ public class Utils {
 
 	static boolean isSnapshot(Project project) {
 		String projectVersion = projectVersion(project)
-		return isSnapshot(projectVersion)
+		return projectVersion.matches('^.*([.-]BUILD)?-SNAPSHOT$')
 	}
 
 	static boolean isMilestone(Project project) {
 		String projectVersion = projectVersion(project)
-		return isMilestone(projectVersion)
-	}
-
-	static boolean isRelease(Project project) {
-		String projectVersion = projectVersion(project)
-		return isRelease(projectVersion)
-	}
-
-	static boolean isSnapshot(String projectVersion) {
-		return projectVersion.matches('^.*([.-]BUILD)?-SNAPSHOT$')
-	}
-
-	static boolean isMilestone(String projectVersion) {
 		return projectVersion.matches('^.*[.-]M\\d+$') || projectVersion.matches('^.*[.-]RC\\d+$')
 	}
 
-	static boolean isRelease(String projectVersion) {
-		return !(isSnapshot(projectVersion) || isMilestone(projectVersion))
+	static boolean isRelease(Project project) {
+		return !(isSnapshot(project) || isMilestone(project))
 	}
 
 	private static String projectVersion(Project project) {

buildSrc/src/test/java/io/spring/gradle/convention/JavadocApiPluginITest.java

@@ -28,7 +28,7 @@ public class JavadocApiPluginITest {
 				.build();
 		assertThat(result.task(":api").getOutcome()).isEqualTo(TaskOutcome.SUCCESS);
         File allClasses = new File(testKit.getRootDir(), "build/api/allclasses-noframe.html");
-		File index = new File(testKit.getRootDir(), "build/api/allclasses-index.html");
+		File index = new File(testKit.getRootDir(), "build/api/allclasses.html");
 		File listing = allClasses.exists() ? allClasses : index;
 		String listingText = FileUtils.readFileToString(listing);
 		assertThat(listingText).contains("sample/Api.html");

buildSrc/src/test/resources/samples/integrationtest/withpropdeps/build.gradle

@@ -9,7 +9,7 @@ repositories {
 }
 
 dependencies {
-	optional 'jakarta.servlet:jakarta.servlet-api:5.0.0'
+	optional 'jakarta.servlet:jakarta.servlet-api:4.0.4'
 	testImplementation platform('org.junit:junit-bom:5.8.1')
 	testImplementation 'org.junit.jupiter:junit-jupiter-api'
 	testImplementation 'org.junit.jupiter:junit-jupiter-engine'

buildSrc/src/test/resources/samples/integrationtest/withpropdeps/src/integration-test/java/sample/TheTest.java

@@ -1,7 +1,7 @@
 package sample;
 
 import org.junit.jupiter.api.Test;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
 
 public class TheTest {
 	@Test

buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/build.gradle

@@ -1,10 +1,10 @@
 plugins {
-    id "org.gretty" version "4.0.0"
+    id "org.gretty" version "3.0.7"
     id "io.spring.convention.spring-sample-war"
 }
 
 dependencies {
-	provided 'jakarta.servlet:jakarta.servlet-api:5.0.0'
+	provided 'jakarta.servlet:jakarta.servlet-api:4.0.4'
     testImplementation 'commons-io:commons-io:2.11.0'
     testImplementation 'org.assertj:assertj-core:3.21.0'
     testImplementation platform('org.junit:junit-bom:5.8.1')

buildSrc/src/test/resources/samples/showcase/samples/sgbcs-sample-war/src/main/java/sample/HelloServlet.java

@@ -18,11 +18,11 @@ package sample;
 
 import java.io.IOException;
 
-import jakarta.servlet.ServletException;
-import jakarta.servlet.annotation.WebServlet;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 @WebServlet("/")
 public class HelloServlet extends HttpServlet {

git/hooks/forward-merge

@@ -0,0 +1,135 @@
+#!/usr/bin/ruby
+require 'json'
+require 'net/http'
+require 'yaml'
+require 'logger'
+
+$log = Logger.new(STDOUT)
+$log.level = Logger::WARN
+
+class ForwardMerge
+  attr_reader :issue, :milestone, :message, :line
+  def initialize(issue, milestone, message, line)
+    @issue = issue
+    @milestone = milestone
+    @message = message
+    @line = line
+  end
+end
+
+def find_forward_merges(message_file)
+  $log.debug "Searching for forward merge"
+  rev=`git rev-parse -q --verify MERGE_HEAD`.strip
+  $log.debug "Found #{rev} from git rev-parse"
+  return nil unless rev
+  message = File.read(message_file)
+  forward_merges = []
+  message.each_line do |line|
+    $log.debug "Checking #{line} for message"
+    match = /^(?:Fixes|Closes) gh-(\d+) in (\d\.\d\.[\dx](?:[\.\-](?:M|RC)\d)?)$/.match(line)
+    if match then
+      issue = match[1]
+      milestone = match[2]
+      $log.debug "Matched reference to issue #{issue} in milestone #{milestone}"
+      forward_merges << ForwardMerge.new(issue, milestone, message, line)
+    end
+  end
+  $log.debug "No match in merge message" unless forward_merges
+  return forward_merges
+end
+
+def get_issue(username, password, repository, number)
+  $log.debug "Getting issue #{number} from GitHub repository #{repository}"
+  uri = URI("https://api.github.com/repos/#{repository}/issues/#{number}")
+  http = Net::HTTP.new(uri.host, uri.port)
+  http.use_ssl=true
+  request = Net::HTTP::Get.new(uri.path)
+  request.basic_auth(username, password)
+  response = http.request(request)
+  $log.debug "Get HTTP response #{response.code}"
+  return JSON.parse(response.body) unless response.code != '200'
+  puts "Failed to retrieve issue #{number}: #{response.message}"
+  exit 1
+end
+
+def find_milestone(username, password, repository, title)
+  $log.debug "Finding milestone #{title} from GitHub repository #{repository}"
+  uri = URI("https://api.github.com/repos/#{repository}/milestones")
+  http = Net::HTTP.new(uri.host, uri.port)
+  http.use_ssl=true
+  request = Net::HTTP::Get.new(uri.path)
+  request.basic_auth(username, password)
+  response = http.request(request)
+  milestones = JSON.parse(response.body)
+  if title.end_with?(".x")
+    prefix = title.delete_suffix('.x')
+    $log.debug "Finding nearest milestone from candidates starting with #{prefix}"
+    titles = milestones.map { |milestone| milestone['title'] }
+    titles = titles.select{ |title| title.start_with?(prefix) unless title.end_with?('.x')}
+    titles = titles.sort_by { |v| Gem::Version.new(v) }
+    $log.debug "Considering candidates #{titles}"
+    if(titles.empty?)
+      puts "Cannot find nearest milestone for prefix #{title}"
+      exit 1
+    end
+    title = titles.first
+    $log.debug "Found nearest milestone #{title}"
+  end
+  milestones.each do |milestone|
+    $log.debug "Considering #{milestone['title']}"
+    return milestone['number'] if milestone['title'] == title
+  end
+  puts "Milestone #{title} not found in #{repository}"
+  exit 1
+end
+
+def create_issue(username, password, repository, original, title, labels, milestone, milestone_name, dry_run)
+  $log.debug "Finding forward-merge issue in GitHub repository #{repository} for '#{title}'"
+  uri = URI("https://api.github.com/repos/#{repository}/issues")
+  http = Net::HTTP.new(uri.host, uri.port)
+  http.use_ssl=true
+  request = Net::HTTP::Post.new(uri.path, 'Content-Type' => 'application/json')
+  request.basic_auth(username, password)
+  request.body = {
+    title: title,
+    labels: labels,
+    milestone: milestone.to_i,
+    body: "Forward port of issue ##{original} to #{milestone_name}."
+  }.to_json
+  if dry_run then
+    puts "Dry run"
+    puts "POSTing to #{uri} with body #{request.body}"
+    return "dry-run"
+  end
+  response = JSON.parse(http.request(request).body)
+  $log.debug "Created new issue #{response['number']}"
+  return response['number']
+end
+
+$log.debug "Running forward-merge hook script"
+message_file=ARGV[0]
+
+forward_merges = find_forward_merges(message_file)
+exit 0 unless forward_merges
+
+$log.debug "Loading config from ~/.spring-boot/forward_merge.yml"
+config = YAML.load_file(File.join(Dir.home, '.spring-boot', 'forward-merge.yml'))
+username = config['github']['credentials']['username']
+password = config['github']['credentials']['password']
+dry_run = config['dry_run']
+repository = 'spring-projects/spring-session'
+
+forward_merges.each do |forward_merge|
+  existing_issue = get_issue(username, password, repository, forward_merge.issue)
+  title = existing_issue['title']
+  labels = existing_issue['labels'].map { |label| label['name'] }
+  labels << "status: forward-port"
+  $log.debug "Processing issue '#{title}'"
+
+  milestone = find_milestone(username, password, repository, forward_merge.milestone)
+  new_issue_number = create_issue(username, password, repository, forward_merge.issue, title, labels, milestone, forward_merge.milestone, dry_run)
+
+  puts "Created gh-#{new_issue_number} for forward port of gh-#{forward_merge.issue} into #{forward_merge.milestone}"
+  rewritten_message = forward_merge.message.sub(forward_merge.line, "Closes gh-#{new_issue_number}\n")
+  File.write(message_file, rewritten_message)
+end

git/hooks/prepare-forward-merge

@@ -0,0 +1,71 @@
+#!/usr/bin/ruby
+require 'json'
+require 'net/http'
+require 'yaml'
+require 'logger'
+
+$main_branch = "3.0.x"
+
+$log = Logger.new(STDOUT)
+$log.level = Logger::WARN
+
+def get_fixed_issues()
+  $log.debug "Searching for for forward merge"
+  rev=`git rev-parse -q --verify MERGE_HEAD`.strip
+  $log.debug "Found #{rev} from git rev-parse"
+  return nil unless rev
+  fixed = []
+  message = `git log -1 --pretty=%B #{rev}`
+  message.each_line do |line|
+    $log.debug "Checking #{line} for message"
+    fixed << line.strip if /^(?:Fixes|Closes) gh-(\d+)/.match(line)
+  end
+  $log.debug "Found fixed issues #{fixed}"
+  return fixed;
+end
+
+def rewrite_message(message_file, fixed)
+  current_branch = `git rev-parse --abbrev-ref HEAD`.strip
+  if current_branch == "main"
+    current_branch = $main_branch
+  end
+  rewritten_message = ""
+  message = File.read(message_file)
+  message.each_line do |line|
+    match = /^Merge.*branch\ '(.*)'(?:\ into\ (.*))?$/.match(line)
+    if match
+      from_branch = match[1]
+      if from_branch.include? "/"
+        from_branch = from_branch.partition("/").last
+      end
+      to_brach = match[2]
+      $log.debug "Rewriting merge message"
+      line = "Merge branch '#{from_branch}'" + (to_brach ? " into #{to_brach}\n" : "\n")
+    end
+    if fixed and line.start_with?("#")
+      $log.debug "Adding fixed"
+      rewritten_message << "\n"
+      fixed.each do |fixes|
+        rewritten_message << "#{fixes} in #{current_branch}\n"
+      end
+      fixed = nil
+    end
+    rewritten_message << line
+  end
+  return rewritten_message
+end
+
+$log.debug "Running prepare-forward-merge hook script"
+
+message_file=ARGV[0]
+message_type=ARGV[1]
+
+if message_type != "merge"
+  $log.debug "Not a merge commit"
+  exit 0;
+end
+
+$log.debug "Searching for for forward merge"
+fixed = get_fixed_issues()
+rewritten_message = rewrite_message(message_file, fixed)
+File.write(message_file, rewritten_message)

gradle.properties

@@ -1,3 +1,3 @@
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
-version=3.0.0-M4
+version=2.7.2-SNAPSHOT

gradle/dependency-management.gradle

@@ -1,41 +1,49 @@
 dependencyManagement {
 	imports {
-		mavenBom 'io.projectreactor:reactor-bom:2022.0.0-M6'
-		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.4'
-		mavenBom 'org.junit:junit-bom:5.9.0'
-		mavenBom 'org.mockito:mockito-bom:4.8.0'
-		mavenBom 'org.springframework:spring-framework-bom:6.0.0-M6'
-		mavenBom 'org.springframework.data:spring-data-bom:2022.0.0-M6'
-		mavenBom 'org.springframework.security:spring-security-bom:6.0.0-M7'
-		mavenBom 'org.testcontainers:testcontainers-bom:1.17.3'
+		mavenBom 'io.projectreactor:reactor-bom:2020.0.30'
+		mavenBom 'com.fasterxml.jackson:jackson-bom:2.13.5'
+		mavenBom 'org.junit:junit-bom:5.8.2'
+		mavenBom 'org.springframework:spring-framework-bom:5.3.26'
+		mavenBom 'org.springframework.data:spring-data-bom:2021.2.9'
+		mavenBom 'org.springframework.security:spring-security-bom:5.7.7'
+		mavenBom 'org.testcontainers:testcontainers-bom:1.17.6'
 	}
 
 	dependencies {
-		dependency 'com.hazelcast:hazelcast:5.1.3'
+		dependencySet(group: 'com.hazelcast', version: '3.12.12') {
+			entry 'hazelcast'
+			entry 'hazelcast-client'
+		}
+
 		dependency 'org.aspectj:aspectjweaver:1.9.9.1'
 		dependency 'ch.qos.logback:logback-core:1.2.11'
 		dependency 'com.google.code.findbugs:jsr305:3.0.2'
-		dependency 'com.h2database:h2:2.1.214'
-		dependency 'com.ibm.db2:jcc:11.5.7.0'
-		dependency 'com.microsoft.sqlserver:mssql-jdbc:11.2.1.jre17'
-		dependency 'com.oracle.database.jdbc:ojdbc8:21.7.0.0'
-		dependency 'com.zaxxer:HikariCP:5.0.1'
+		dependency 'com.h2database:h2:1.4.200'
+		dependency 'com.ibm.db2:jcc:11.5.8.0'
+		dependency 'com.microsoft.sqlserver:mssql-jdbc:9.4.1.jre8'
+		dependency 'com.oracle.database.jdbc:ojdbc8:21.5.0.0'
+		dependency 'com.zaxxer:HikariCP:4.0.3'
 		dependency 'edu.umd.cs.mtc:multithreadedtc:1.01'
-		dependency 'io.lettuce:lettuce-core:6.2.0.RELEASE'
-		dependency 'jakarta.annotation:jakarta.annotation-api:2.0.0'
-		dependency 'jakarta.servlet:jakarta.servlet-api:5.0.0'
-		dependency 'mysql:mysql-connector-java:8.0.30'
+		dependency 'io.lettuce:lettuce-core:6.1.10.RELEASE'
+		dependency 'jakarta.annotation:jakarta.annotation-api:1.3.5'
+		dependency 'jakarta.servlet:jakarta.servlet-api:4.0.4'
+		dependency 'mysql:mysql-connector-java:8.0.32'
 		dependency 'org.apache.derby:derby:10.14.2.0'
-		dependency 'org.assertj:assertj-core:3.23.1'
+		dependency 'org.assertj:assertj-core:3.22.0'
 		dependency 'org.hamcrest:hamcrest:2.2'
-		dependency 'org.hsqldb:hsqldb:2.7.0'
-		dependency 'org.mariadb.jdbc:mariadb-java-client:3.0.7'
-		dependencySet(group: 'org.mongodb', version: '4.7.1') {
+		dependency 'org.hsqldb:hsqldb:2.5.2'
+		dependency 'org.mariadb.jdbc:mariadb-java-client:2.7.8'
+		dependencySet(group: 'org.mockito', version: '4.5.1') {
+        	entry 'mockito-core'
+			entry 'mockito-junit-jupiter'
+		}
+
+		dependencySet(group: 'org.mongodb', version: '4.6.1') {
 			entry 'mongodb-driver-core'
 			entry 'mongodb-driver-sync'
 			entry 'mongodb-driver-reactivestreams'
 		}
-		dependency 'org.postgresql:postgresql:42.5.0'
+		dependency 'org.postgresql:postgresql:42.3.8'
 	}
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-    id "com.gradle.enterprise" version "3.9"
+    id "com.gradle.enterprise" version "3.12.3"
     id "io.spring.ge.conventions" version "0.0.7"
 }
 
@@ -18,6 +18,8 @@ include 'spring-session-data-redis'
 include 'spring-session-docs'
 include 'spring-session-hazelcast'
 include 'spring-session-jdbc'
+include 'hazelcast4'
+project(':hazelcast4').projectDir = file('spring-session-hazelcast/hazelcast4')
 
 file('spring-session-samples').eachDirMatch(~/spring-session-sample-.*/) { dir ->
     include dir.name

spring-session-core/spring-session-core.gradle

@@ -19,8 +19,6 @@ dependencies {
 
 	testImplementation "io.projectreactor:reactor-test"
 	testImplementation "org.mockito:mockito-core"
-	testImplementation "org.mockito:mockito-junit-jupiter"
-	testImplementation "org.mockito:mockito-inline"
 	testImplementation "edu.umd.cs.mtc:multithreadedtc"
 	testImplementation "org.springframework:spring-test"
 	testImplementation "org.assertj:assertj-core"

spring-session-core/src/main/java/org/springframework/session/aot/hint/CommonSessionRuntimeHints.java

@@ -1,48 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.session.aot.hint;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.TreeSet;
-
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-import org.springframework.aot.hint.TypeReference;
-
-/**
- * A {@link RuntimeHintsRegistrar} for common session hints.
- *
- * @author Marcus Da Coregio
- */
-class CommonSessionRuntimeHints implements RuntimeHintsRegistrar {
-
-	@Override
-	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-		Arrays.asList(TypeReference.of(String.class), TypeReference.of(ArrayList.class),
-				TypeReference.of(TreeSet.class), TypeReference.of(Number.class), TypeReference.of(Long.class),
-				TypeReference.of(Integer.class), TypeReference.of(StackTraceElement.class),
-				TypeReference.of(Throwable.class), TypeReference.of(Exception.class),
-				TypeReference.of(RuntimeException.class),
-				TypeReference.of("java.util.Collections$UnmodifiableCollection"),
-				TypeReference.of("java.util.Collections$UnmodifiableList"),
-				TypeReference.of("java.util.Collections$EmptyList"),
-				TypeReference.of("java.util.Collections$UnmodifiableRandomAccessList"),
-				TypeReference.of("java.util.Collections$UnmodifiableSet")).forEach(hints.serialization()::registerType);
-	}
-
-}

spring-session-core/src/main/java/org/springframework/session/aot/hint/CommonSessionSecurityRuntimeHints.java

@@ -1,86 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.session.aot.hint;
-
-import java.util.Arrays;
-
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-import org.springframework.aot.hint.TypeReference;
-
-/**
- * A {@link RuntimeHintsRegistrar} for common session security hints.
- *
- * @author Marcus Da Coregio
- */
-class CommonSessionSecurityRuntimeHints implements RuntimeHintsRegistrar {
-
-	@Override
-	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-		registerSecurityHintsIfNeeded(hints);
-		registerOAuth2ClientHintsIfNeeded(hints);
-		registerOAuth2ResourceServerHintsIfNeeded(hints);
-	}
-
-	private void registerSecurityHintsIfNeeded(RuntimeHints hints) {
-		Arrays.asList(TypeReference.of("org.springframework.security.core.context.SecurityContextImpl"),
-				TypeReference.of("org.springframework.security.core.authority.SimpleGrantedAuthority"),
-				TypeReference.of("org.springframework.security.core.userdetails.User"),
-				TypeReference.of("org.springframework.security.authentication.AbstractAuthenticationToken"),
-				TypeReference.of("org.springframework.security.authentication.UsernamePasswordAuthenticationToken"),
-				TypeReference.of("org.springframework.security.core.AuthenticationException"),
-				TypeReference.of("org.springframework.security.authentication.BadCredentialsException"),
-				TypeReference.of("org.springframework.security.core.userdetails.UsernameNotFoundException"),
-				TypeReference.of("org.springframework.security.authentication.AccountExpiredException"),
-				TypeReference.of("org.springframework.security.authentication.ProviderNotFoundException"),
-				TypeReference.of("org.springframework.security.authentication.DisabledException"),
-				TypeReference.of("org.springframework.security.authentication.LockedException"),
-				TypeReference.of("org.springframework.security.authentication.AuthenticationServiceException"),
-				TypeReference.of("org.springframework.security.authentication.CredentialsExpiredException"),
-				TypeReference.of("org.springframework.security.authentication.InsufficientAuthenticationException"),
-				TypeReference
-						.of("org.springframework.security.web.authentication.session.SessionAuthenticationException"),
-				TypeReference.of(
-						"org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationException"),
-				TypeReference.of("org.springframework.security.core.userdetails.User$AuthorityComparator"))
-				.forEach((type) -> hints.serialization().registerType(type, (hint) -> hint.onReachableType(
-						TypeReference.of("org.springframework.security.core.context.SecurityContextImpl"))));
-	}
-
-	private void registerOAuth2ResourceServerHintsIfNeeded(RuntimeHints hints) {
-		Arrays.asList(
-				TypeReference.of("org.springframework.security.oauth2.server.resource.BearerTokenAuthenticationToken"),
-				TypeReference.of(
-						"org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken"),
-				TypeReference.of("org.springframework.security.oauth2.core.OAuth2AuthenticationException"))
-				.forEach((type) -> hints.serialization().registerType(type, (hint) -> hint.onReachableType(TypeReference
-						.of("org.springframework.security.oauth2.server.resource.BearerTokenAuthenticationToken"))));
-	}
-
-	private void registerOAuth2ClientHintsIfNeeded(RuntimeHints hints) {
-		Arrays.asList(
-				TypeReference.of("org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken"),
-				TypeReference
-						.of("org.springframework.security.oauth2.client.authentication.OAuth2LoginAuthenticationToken"),
-				TypeReference.of(
-						"org.springframework.security.oauth2.client.authentication.OAuth2AuthorizationCodeAuthenticationToken"),
-				TypeReference.of("org.springframework.security.oauth2.core.OAuth2AuthenticationException"))
-				.forEach((type) -> hints.serialization().registerType(type, (hint) -> hint.onReachableType(TypeReference
-						.of("org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken"))));
-	}
-
-}

spring-session-core/src/main/java/org/springframework/session/aot/hint/server/WebSessionSecurityRuntimeHints.java

@@ -1,40 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.session.aot.hint.server;
-
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-import org.springframework.security.web.server.csrf.DefaultCsrfToken;
-import org.springframework.util.ClassUtils;
-
-/**
- * {@link RuntimeHintsRegistrar} for Reactive Session hints.
- *
- * @author Marcus Da Coregio
- */
-class WebSessionSecurityRuntimeHints implements RuntimeHintsRegistrar {
-
-	@Override
-	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-		if (!ClassUtils.isPresent("org.springframework.web.server.WebSession", classLoader) || !ClassUtils
-				.isPresent("org.springframework.security.web.server.csrf.DefaultCsrfToken", classLoader)) {
-			return;
-		}
-		hints.serialization().registerType(DefaultCsrfToken.class);
-	}
-
-}

spring-session-core/src/main/java/org/springframework/session/aot/hint/servlet/HttpSessionSecurityRuntimeHints.java

@@ -1,52 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.session.aot.hint.servlet;
-
-import java.util.Arrays;
-import java.util.Locale;
-import java.util.TreeMap;
-
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-import org.springframework.aot.hint.TypeReference;
-import org.springframework.security.web.authentication.WebAuthenticationDetails;
-import org.springframework.security.web.csrf.DefaultCsrfToken;
-import org.springframework.security.web.savedrequest.DefaultSavedRequest;
-import org.springframework.security.web.savedrequest.SavedCookie;
-import org.springframework.util.ClassUtils;
-
-/**
- * {@link RuntimeHintsRegistrar} for Servlet Session hints.
- *
- * @author Marcus Da Coregio
- */
-class HttpSessionSecurityRuntimeHints implements RuntimeHintsRegistrar {
-
-	@Override
-	public void registerHints(RuntimeHints hints, ClassLoader classLoader) {
-		if (!ClassUtils.isPresent("jakarta.servlet.http.HttpSession", classLoader)
-				|| !ClassUtils.isPresent("org.springframework.security.web.csrf.DefaultCsrfToken", classLoader)) {
-			return;
-		}
-		Arrays.asList(TypeReference.of(TreeMap.class), TypeReference.of(Locale.class),
-				TypeReference.of(DefaultSavedRequest.class), TypeReference.of(DefaultCsrfToken.class),
-				TypeReference.of(WebAuthenticationDetails.class), TypeReference.of(SavedCookie.class),
-				TypeReference.of("java.lang.String$CaseInsensitiveComparator"))
-				.forEach(hints.serialization()::registerType);
-	}
-
-}

spring-session-core/src/main/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfiguration.java

@@ -19,10 +19,10 @@ package org.springframework.session.config.annotation.web.http;
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.annotation.PostConstruct;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.SessionCookieConfig;
-import jakarta.servlet.http.HttpSessionListener;
+import javax.annotation.PostConstruct;
+import javax.servlet.ServletContext;
+import javax.servlet.SessionCookieConfig;
+import javax.servlet.http.HttpSessionListener;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

spring-session-core/src/main/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServices.java

@@ -16,9 +16,9 @@
 
 package org.springframework.session.security.web.authentication;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

spring-session-core/src/main/java/org/springframework/session/web/context/AbstractHttpSessionApplicationInitializer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -19,10 +19,10 @@ package org.springframework.session.web.context;
 import java.util.Arrays;
 import java.util.EnumSet;
 
-import jakarta.servlet.DispatcherType;
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterRegistration.Dynamic;
-import jakarta.servlet.ServletContext;
+import javax.servlet.DispatcherType;
+import javax.servlet.Filter;
+import javax.servlet.FilterRegistration.Dynamic;
+import javax.servlet.ServletContext;
 
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.Conventions;

spring-session-core/src/main/java/org/springframework/session/web/http/CookieHttpSessionIdResolver.java

@@ -18,8 +18,8 @@ package org.springframework.session.web.http;
 
 import java.util.List;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.springframework.session.web.http.CookieSerializer.CookieValue;
 
@@ -32,8 +32,8 @@ import org.springframework.session.web.http.CookieSerializer.CookieValue;
  * When a session is created, the HTTP response will have a cookie with the specified
  * cookie name and the value of the session id. The cookie will be marked as a session
  * cookie, use the context path for the path of the cookie, marked as HTTPOnly, and if
- * {@link jakarta.servlet.http.HttpServletRequest#isSecure()} returns true, the cookie
- * will be marked as secure. For example:
+ * {@link javax.servlet.http.HttpServletRequest#isSecure()} returns true, the cookie will
+ * be marked as secure. For example:
  *
  * <pre>
  * HTTP/1.1 200 OK

spring-session-core/src/main/java/org/springframework/session/web/http/CookieSerializer.java

@@ -18,9 +18,9 @@ package org.springframework.session.web.http;
 
 import java.util.List;
 
-import jakarta.servlet.http.Cookie;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * Strategy for reading and writing a cookie value to the {@link HttpServletResponse}.

spring-session-core/src/main/java/org/springframework/session/web/http/DefaultCookieSerializer.java

@@ -28,9 +28,9 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import jakarta.servlet.http.Cookie;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -88,8 +88,7 @@ public class DefaultCookieSerializer implements CookieSerializer {
 	private String sameSite = "Lax";
 
 	/*
-	 * @see
-	 * org.springframework.session.web.http.CookieSerializer#readCookieValues(jakarta.
+	 * @see org.springframework.session.web.http.CookieSerializer#readCookieValues(javax.
 	 * servlet.http.HttpServletRequest)
 	 */
 	@Override

spring-session-core/src/main/java/org/springframework/session/web/http/HeaderHttpSessionIdResolver.java

@@ -19,8 +19,8 @@ package org.springframework.session.web.http;
 import java.util.Collections;
 import java.util.List;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * A {@link HttpSessionIdResolver} that uses a header to resolve the session id.

spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionAdapter.java

@@ -22,11 +22,11 @@ import java.util.Enumeration;
 import java.util.NoSuchElementException;
 import java.util.Set;
 
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.http.HttpSession;
-import jakarta.servlet.http.HttpSessionBindingEvent;
-import jakarta.servlet.http.HttpSessionBindingListener;
-import jakarta.servlet.http.HttpSessionContext;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
+import javax.servlet.http.HttpSessionContext;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;

spring-session-core/src/main/java/org/springframework/session/web/http/HttpSessionIdResolver.java

@@ -18,8 +18,8 @@ package org.springframework.session.web.http;
 
 import java.util.List;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * Contract for session id resolution strategies. Allows for session id resolution through

spring-session-core/src/main/java/org/springframework/session/web/http/OnCommittedResponseWrapper.java

@@ -20,14 +20,14 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Locale;
 
-import jakarta.servlet.ServletOutputStream;
-import jakarta.servlet.WriteListener;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpServletResponseWrapper;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.WriteListener;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponseWrapper;
 
 /**
  * Base class for response wrappers which encapsulate the logic for handling an event when
- * the {@link jakarta.servlet.http.HttpServletResponse} is committed.
+ * the {@link javax.servlet.http.HttpServletResponse} is committed.
  *
  * @author Rob Winch
  * @since 1.0
@@ -84,16 +84,16 @@ abstract class OnCommittedResponseWrapper extends HttpServletResponseWrapper {
 	/**
 	 * Invoke this method to disable invoking
 	 * {@link OnCommittedResponseWrapper#onResponseCommitted()} when the
-	 * {@link jakarta.servlet.http.HttpServletResponse} is committed. This can be useful
-	 * in the event that Async Web Requests are made.
+	 * {@link javax.servlet.http.HttpServletResponse} is committed. This can be useful in
+	 * the event that Async Web Requests are made.
 	 */
 	private void disableOnResponseCommitted() {
 		this.disableOnCommitted = true;
 	}
 
 	/**
-	 * Implement the logic for handling the
-	 * {@link jakarta.servlet.http.HttpServletResponse} being committed.
+	 * Implement the logic for handling the {@link javax.servlet.http.HttpServletResponse}
+	 * being committed.
 	 */
 	protected abstract void onResponseCommitted();
 
@@ -474,9 +474,8 @@ abstract class OnCommittedResponseWrapper extends HttpServletResponseWrapper {
 	/**
 	 * Ensures{@link OnCommittedResponseWrapper#onResponseCommitted()} is invoked before
 	 * calling methods that commit the response. We delegate all methods to the original
-	 * {@link jakarta.servlet.ServletOutputStream} to ensure that the behavior is as close
-	 * to the original {@link jakarta.servlet.ServletOutputStream} as possible. See
-	 * SEC-2039
+	 * {@link javax.servlet.ServletOutputStream} to ensure that the behavior is as close
+	 * to the original {@link javax.servlet.ServletOutputStream} as possible. See SEC-2039
 	 *
 	 * @author Rob Winch
 	 */

spring-session-core/src/main/java/org/springframework/session/web/http/OncePerRequestFilter.java

@@ -18,15 +18,15 @@ package org.springframework.session.web.http;
 
 import java.io.IOException;
 
-import jakarta.servlet.DispatcherType;
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.DispatcherType;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * Allows for easily ensuring that a request is only invoked once per request. This is a

spring-session-core/src/main/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapter.java

@@ -18,10 +18,10 @@ package org.springframework.session.web.http;
 
 import java.util.List;
 
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.http.HttpSession;
-import jakarta.servlet.http.HttpSessionEvent;
-import jakarta.servlet.http.HttpSessionListener;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
 
 import org.springframework.context.ApplicationListener;
 import org.springframework.session.Session;
@@ -79,8 +79,9 @@ public class SessionEventHttpSessionListenerAdapter
 	}
 
 	/*
-	 * @see org.springframework.web.context.ServletContextAware#setServletContext(jakarta.
-	 * servlet.ServletContext)
+	 * @see
+	 * org.springframework.web.context.ServletContextAware#setServletContext(javax.servlet
+	 * .ServletContext)
 	 */
 	@Override
 	public void setServletContext(ServletContext servletContext) {

spring-session-core/src/main/java/org/springframework/session/web/http/SessionRepositoryFilter.java

@@ -20,16 +20,16 @@ import java.io.IOException;
 import java.time.Instant;
 import java.util.List;
 
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.RequestDispatcher;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletRequestWrapper;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
+import javax.servlet.FilterChain;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -39,29 +39,29 @@ import org.springframework.session.Session;
 import org.springframework.session.SessionRepository;
 
 /**
- * Switches the {@link jakarta.servlet.http.HttpSession} implementation to be backed by a
+ * Switches the {@link javax.servlet.http.HttpSession} implementation to be backed by a
  * {@link org.springframework.session.Session}.
  *
  * The {@link SessionRepositoryFilter} wraps the
- * {@link jakarta.servlet.http.HttpServletRequest} and overrides the methods to get an
- * {@link jakarta.servlet.http.HttpSession} to be backed by a
+ * {@link javax.servlet.http.HttpServletRequest} and overrides the methods to get an
+ * {@link javax.servlet.http.HttpSession} to be backed by a
  * {@link org.springframework.session.Session} returned by the
  * {@link org.springframework.session.SessionRepository}.
  *
  * The {@link SessionRepositoryFilter} uses a {@link HttpSessionIdResolver} (default
  * {@link CookieHttpSessionIdResolver}) to bridge logic between an
- * {@link jakarta.servlet.http.HttpSession} and the
+ * {@link javax.servlet.http.HttpSession} and the
  * {@link org.springframework.session.Session} abstraction. Specifically:
  *
  * <ul>
  * <li>The session id is looked up using
- * {@link HttpSessionIdResolver#resolveSessionIds(jakarta.servlet.http.HttpServletRequest)}
+ * {@link HttpSessionIdResolver#resolveSessionIds(javax.servlet.http.HttpServletRequest)}
  * . The default is to look in a cookie named SESSION.</li>
  * <li>The session id of newly created {@link org.springframework.session.Session} is sent
  * to the client using
- * {@link HttpSessionIdResolver#setSessionId(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse, String)}
+ * {@link HttpSessionIdResolver#setSessionId(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, String)}
  * <li>The client is notified that the session id is no longer valid with
- * {@link HttpSessionIdResolver#expireSession(jakarta.servlet.http.HttpServletRequest, jakarta.servlet.http.HttpServletResponse)}
+ * {@link HttpSessionIdResolver#expireSession(javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)}
  * </li>
  * </ul>
  *
@@ -183,8 +183,8 @@ public class SessionRepositoryFilter<S extends Session> extends OncePerRequestFi
 	}
 
 	/**
-	 * A {@link jakarta.servlet.http.HttpServletRequest} that retrieves the
-	 * {@link jakarta.servlet.http.HttpSession} using a
+	 * A {@link javax.servlet.http.HttpServletRequest} that retrieves the
+	 * {@link javax.servlet.http.HttpSession} using a
 	 * {@link org.springframework.session.SessionRepository}.
 	 *
 	 * @author Rob Winch

spring-session-core/src/main/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptor.java

@@ -21,7 +21,7 @@ import java.util.EnumSet;
 import java.util.Map;
 import java.util.Set;
 
-import jakarta.servlet.http.HttpSession;
+import javax.servlet.http.HttpSession;
 
 import org.springframework.http.server.ServerHttpRequest;
 import org.springframework.http.server.ServerHttpResponse;

spring-session-core/src/main/resources/META-INF/spring/aot.factories

@@ -1,5 +0,0 @@
-org.springframework.aot.hint.RuntimeHintsRegistrar=\
-org.springframework.session.aot.hint.CommonSessionRuntimeHints,\
-org.springframework.session.aot.hint.CommonSessionSecurityRuntimeHints,\
-org.springframework.session.aot.hint.servlet.HttpSessionSecurityRuntimeHints,\
-org.springframework.session.aot.hint.server.WebSessionSecurityRuntimeHints

spring-session-core/src/test/java/org/springframework/session/aot/hint/CommonSessionRuntimeHintsTests.java

@@ -1,74 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.session.aot.hint;
-
-import java.util.ArrayList;
-import java.util.TreeSet;
-import java.util.stream.Stream;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-import org.springframework.aot.hint.TypeReference;
-import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
-import org.springframework.core.io.support.SpringFactoriesLoader;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests for {@link CommonSessionRuntimeHints}
- *
- * @author Marcus Da Coregio
- */
-class CommonSessionRuntimeHintsTests {
-
-	private final RuntimeHints hints = new RuntimeHints();
-
-	private final CommonSessionRuntimeHints commonSessionRuntimeHints = new CommonSessionRuntimeHints();
-
-	@ParameterizedTest
-	@MethodSource("getSerializationHintTypes")
-	void commonSessionTypesHasHints(TypeReference typeReference) {
-		this.commonSessionRuntimeHints.registerHints(this.hints, getClass().getClassLoader());
-		assertThat(RuntimeHintsPredicates.serialization().onType(typeReference)).accepts(this.hints);
-	}
-
-	@Test
-	void aotFactoriesContainsRegistrar() {
-		boolean match = SpringFactoriesLoader.forResourceLocation("META-INF/spring/aot.factories")
-				.load(RuntimeHintsRegistrar.class).stream()
-				.anyMatch((registrar) -> registrar instanceof CommonSessionRuntimeHints);
-		assertThat(match).isTrue();
-	}
-
-	private static Stream<TypeReference> getSerializationHintTypes() {
-		return Stream.of(TypeReference.of(String.class), TypeReference.of(ArrayList.class),
-				TypeReference.of(TreeSet.class), TypeReference.of(Number.class), TypeReference.of(Long.class),
-				TypeReference.of(Integer.class), TypeReference.of(StackTraceElement.class),
-				TypeReference.of(Throwable.class), TypeReference.of(Exception.class),
-				TypeReference.of(RuntimeException.class),
-				TypeReference.of("java.util.Collections$UnmodifiableCollection"),
-				TypeReference.of("java.util.Collections$UnmodifiableList"),
-				TypeReference.of("java.util.Collections$EmptyList"),
-				TypeReference.of("java.util.Collections$UnmodifiableRandomAccessList"),
-				TypeReference.of("java.util.Collections$UnmodifiableSet"));
-	}
-
-}

spring-session-core/src/test/java/org/springframework/session/aot/hint/CommonSessionSecurityRuntimeHintsTests.java

@@ -1,92 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.session.aot.hint;
-
-import java.util.stream.Stream;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-import org.springframework.aot.hint.TypeReference;
-import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
-import org.springframework.core.io.support.SpringFactoriesLoader;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * Tests for {@link CommonSessionSecurityRuntimeHints}
- *
- * @author Marcus Da Coregio
- */
-class CommonSessionSecurityRuntimeHintsTests {
-
-	private final RuntimeHints hints = new RuntimeHints();
-
-	private final CommonSessionSecurityRuntimeHints commonSessionSecurityRuntimeHints = new CommonSessionSecurityRuntimeHints();
-
-	@ParameterizedTest
-	@MethodSource("getSerializationHintTypes")
-	void commonSecurityTypesHasHints(TypeReference typeReference) {
-		this.commonSessionSecurityRuntimeHints.registerHints(this.hints, getClass().getClassLoader());
-		assertThat(RuntimeHintsPredicates.serialization().onType(typeReference)).accepts(this.hints);
-	}
-
-	@Test
-	void aotFactoriesContainsRegistrar() {
-		boolean match = SpringFactoriesLoader.forResourceLocation("META-INF/spring/aot.factories")
-				.load(RuntimeHintsRegistrar.class).stream()
-				.anyMatch((registrar) -> registrar instanceof CommonSessionSecurityRuntimeHints);
-		assertThat(match).isTrue();
-	}
-
-	private static Stream<TypeReference> getSerializationHintTypes() {
-		return Stream.of(TypeReference.of("org.springframework.security.core.context.SecurityContextImpl"),
-				TypeReference.of("org.springframework.security.core.authority.SimpleGrantedAuthority"),
-				TypeReference.of("org.springframework.security.core.userdetails.User"),
-				TypeReference.of("org.springframework.security.authentication.AbstractAuthenticationToken"),
-				TypeReference.of("org.springframework.security.authentication.UsernamePasswordAuthenticationToken"),
-				TypeReference.of("org.springframework.security.core.AuthenticationException"),
-				TypeReference.of("org.springframework.security.authentication.BadCredentialsException"),
-				TypeReference.of("org.springframework.security.core.userdetails.UsernameNotFoundException"),
-				TypeReference.of("org.springframework.security.authentication.AccountExpiredException"),
-				TypeReference.of("org.springframework.security.authentication.ProviderNotFoundException"),
-				TypeReference.of("org.springframework.security.authentication.DisabledException"),
-				TypeReference.of("org.springframework.security.authentication.LockedException"),
-				TypeReference.of("org.springframework.security.authentication.AuthenticationServiceException"),
-				TypeReference.of("org.springframework.security.authentication.CredentialsExpiredException"),
-				TypeReference.of("org.springframework.security.authentication.InsufficientAuthenticationException"),
-				TypeReference
-						.of("org.springframework.security.web.authentication.session.SessionAuthenticationException"),
-				TypeReference.of(
-						"org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationException"),
-				TypeReference.of("org.springframework.security.core.userdetails.User$AuthorityComparator"),
-				TypeReference.of("org.springframework.security.oauth2.server.resource.BearerTokenAuthenticationToken"),
-				TypeReference.of(
-						"org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken"),
-				TypeReference.of("org.springframework.security.oauth2.core.OAuth2AuthenticationException"),
-				TypeReference.of("org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken"),
-				TypeReference
-						.of("org.springframework.security.oauth2.client.authentication.OAuth2LoginAuthenticationToken"),
-				TypeReference.of(
-						"org.springframework.security.oauth2.client.authentication.OAuth2AuthorizationCodeAuthenticationToken"),
-				TypeReference.of("org.springframework.security.oauth2.core.OAuth2AuthenticationException"));
-	}
-
-}

spring-session-core/src/test/java/org/springframework/session/aot/hint/server/WebSessionSecurityRuntimeHintsTests.java

@@ -1,81 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.session.aot.hint.server;
-
-import org.junit.jupiter.api.Test;
-import org.mockito.MockedStatic;
-
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
-import org.springframework.core.io.support.SpringFactoriesLoader;
-import org.springframework.security.web.server.csrf.DefaultCsrfToken;
-import org.springframework.util.ClassUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mockStatic;
-
-/**
- * Tests for {@link WebSessionSecurityRuntimeHints}
- *
- * @author Marcus Da Coregio
- */
-class WebSessionSecurityRuntimeHintsTests {
-
-	private final RuntimeHints hints = new RuntimeHints();
-
-	private final WebSessionSecurityRuntimeHints webSessionSecurityRuntimeHints = new WebSessionSecurityRuntimeHints();
-
-	@Test
-	void defaultCsrfTokenHasHints() {
-		this.webSessionSecurityRuntimeHints.registerHints(this.hints, getClass().getClassLoader());
-		assertThat(RuntimeHintsPredicates.serialization().onType(DefaultCsrfToken.class)).accepts(this.hints);
-	}
-
-	@Test
-	void registerHintsWhenWebSessionMissingThenDoNotRegisterHints() {
-		try (MockedStatic<ClassUtils> classUtilsMock = mockStatic(ClassUtils.class)) {
-			classUtilsMock.when(() -> ClassUtils.isPresent(eq("org.springframework.web.server.WebSession"), any()))
-					.thenReturn(false);
-			this.webSessionSecurityRuntimeHints.registerHints(this.hints, getClass().getClassLoader());
-			assertThat(this.hints.serialization().javaSerialization()).isEmpty();
-		}
-	}
-
-	@Test
-	void registerHintsWhenDefaultCsrfTokenMissingThenDoNotRegisterHints() {
-		try (MockedStatic<ClassUtils> classUtilsMock = mockStatic(ClassUtils.class)) {
-			classUtilsMock
-					.when(() -> ClassUtils
-							.isPresent(eq("org.springframework.security.web.server.csrf.DefaultCsrfToken"), any()))
-					.thenReturn(false);
-			this.webSessionSecurityRuntimeHints.registerHints(this.hints, getClass().getClassLoader());
-			assertThat(this.hints.serialization().javaSerialization()).isEmpty();
-		}
-	}
-
-	@Test
-	void aotFactoriesContainsRegistrar() {
-		boolean match = SpringFactoriesLoader.forResourceLocation("META-INF/spring/aot.factories")
-				.load(RuntimeHintsRegistrar.class).stream()
-				.anyMatch((registrar) -> registrar instanceof WebSessionSecurityRuntimeHints);
-		assertThat(match).isTrue();
-	}
-
-}

spring-session-core/src/test/java/org/springframework/session/aot/hint/servlet/HttpSessionSecurityRuntimeHintsTests.java

@@ -1,98 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.session.aot.hint.servlet;
-
-import java.util.Locale;
-import java.util.TreeMap;
-import java.util.stream.Stream;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.mockito.MockedStatic;
-
-import org.springframework.aot.hint.RuntimeHints;
-import org.springframework.aot.hint.RuntimeHintsRegistrar;
-import org.springframework.aot.hint.TypeReference;
-import org.springframework.aot.hint.predicate.RuntimeHintsPredicates;
-import org.springframework.core.io.support.SpringFactoriesLoader;
-import org.springframework.security.web.authentication.WebAuthenticationDetails;
-import org.springframework.security.web.csrf.DefaultCsrfToken;
-import org.springframework.security.web.savedrequest.DefaultSavedRequest;
-import org.springframework.security.web.savedrequest.SavedCookie;
-import org.springframework.util.ClassUtils;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mockStatic;
-
-/**
- * Tests for {@link HttpSessionSecurityRuntimeHints}
- *
- * @author Marcus Da Coregio
- */
-class HttpSessionSecurityRuntimeHintsTests {
-
-	private final RuntimeHints hints = new RuntimeHints();
-
-	private final HttpSessionSecurityRuntimeHints httpSessionSecurityRuntimeHints = new HttpSessionSecurityRuntimeHints();
-
-	@ParameterizedTest
-	@MethodSource("getSerializationHintTypes")
-	void httpSessionHasHints(TypeReference typeReference) {
-		this.httpSessionSecurityRuntimeHints.registerHints(this.hints, getClass().getClassLoader());
-		assertThat(RuntimeHintsPredicates.serialization().onType(typeReference)).accepts(this.hints);
-	}
-
-	@Test
-	void registerHintsWhenHttpSessionMissingThenDoNotRegisterHints() {
-		try (MockedStatic<ClassUtils> classUtilsMock = mockStatic(ClassUtils.class)) {
-			classUtilsMock.when(() -> ClassUtils.isPresent(eq("jakarta.servlet.http.HttpSession"), any()))
-					.thenReturn(false);
-			this.httpSessionSecurityRuntimeHints.registerHints(this.hints, getClass().getClassLoader());
-			assertThat(this.hints.serialization().javaSerialization()).isEmpty();
-		}
-	}
-
-	@Test
-	void registerHintsWhenDefaultCsrfTokenMissingThenDoNotRegisterHints() {
-		try (MockedStatic<ClassUtils> classUtilsMock = mockStatic(ClassUtils.class)) {
-			classUtilsMock.when(
-					() -> ClassUtils.isPresent(eq("org.springframework.security.web.csrf.DefaultCsrfToken"), any()))
-					.thenReturn(false);
-			this.httpSessionSecurityRuntimeHints.registerHints(this.hints, getClass().getClassLoader());
-			assertThat(this.hints.serialization().javaSerialization()).isEmpty();
-		}
-	}
-
-	@Test
-	void aotFactoriesContainsRegistrar() {
-		boolean match = SpringFactoriesLoader.forResourceLocation("META-INF/spring/aot.factories")
-				.load(RuntimeHintsRegistrar.class).stream()
-				.anyMatch((registrar) -> registrar instanceof HttpSessionSecurityRuntimeHints);
-		assertThat(match).isTrue();
-	}
-
-	private static Stream<TypeReference> getSerializationHintTypes() {
-		return Stream.of(TypeReference.of(TreeMap.class), TypeReference.of(Locale.class),
-				TypeReference.of(DefaultSavedRequest.class), TypeReference.of(DefaultCsrfToken.class),
-				TypeReference.of(WebAuthenticationDetails.class), TypeReference.of(SavedCookie.class),
-				TypeReference.of("java.lang.String$CaseInsensitiveComparator"));
-	}
-
-}

spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/EnableSpringHttpSessionCustomCookieSerializerTests.java

@@ -19,10 +19,10 @@ package org.springframework.session.config.annotation.web.http;
 import java.io.IOException;
 import java.util.Collections;
 
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

spring-session-core/src/test/java/org/springframework/session/config/annotation/web/http/SpringHttpSessionConfigurationTests.java

@@ -18,7 +18,7 @@ package org.springframework.session.config.annotation.web.http;
 
 import java.util.concurrent.ConcurrentHashMap;
 
-import jakarta.servlet.ServletContext;
+import javax.servlet.ServletContext;
 
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;

spring-session-core/src/test/java/org/springframework/session/security/SpringSessionBackedSessionRegistryTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -24,12 +24,12 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.MockitoAnnotations;
 
 import org.springframework.security.core.AuthenticatedPrincipal;
 import org.springframework.security.core.Authentication;
@@ -44,12 +44,10 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.mock;
 import static org.mockito.BDDMockito.verify;
-import static org.mockito.Mockito.withSettings;
 
 /**
  * Tests for {@link SpringSessionBackedSessionRegistry}.
  */
-@ExtendWith(MockitoExtension.class)
 class SpringSessionBackedSessionRegistryTest {
 
 	private static final String SESSION_ID = "sessionId";
@@ -68,6 +66,11 @@ class SpringSessionBackedSessionRegistryTest {
 	@InjectMocks
 	private SpringSessionBackedSessionRegistry<Session> sessionRegistry;
 
+	@BeforeEach
+	void setUp() {
+		MockitoAnnotations.initMocks(this);
+	}
+
 	@Test
 	void sessionInformationForExistingSession() {
 		Session session = createSession(SESSION_ID, USER_NAME, NOW);
@@ -154,7 +157,7 @@ class SpringSessionBackedSessionRegistryTest {
 	private Session createSession(String sessionId, String userName, Instant lastAccessed) {
 		MapSession session = new MapSession(sessionId);
 		session.setLastAccessedTime(lastAccessed);
-		Authentication authentication = mock(Authentication.class, withSettings().lenient());
+		Authentication authentication = mock(Authentication.class);
 		given(authentication.getName()).willReturn(userName);
 		SecurityContextImpl securityContext = new SecurityContextImpl();
 		securityContext.setAuthentication(authentication);

spring-session-core/src/test/java/org/springframework/session/security/web/authentication/SpringSessionRememberMeServicesTests.java

@@ -16,9 +16,9 @@
 
 package org.springframework.session.security.web.authentication;
 
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 
 import org.junit.jupiter.api.Test;
 

spring-session-core/src/test/java/org/springframework/session/web/http/CookieHttpSessionIdResolverTests.java

@@ -19,7 +19,7 @@ package org.springframework.session.web.http;
 import java.util.Base64;
 import java.util.Collections;
 
-import jakarta.servlet.http.Cookie;
+import javax.servlet.http.Cookie;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

spring-session-core/src/test/java/org/springframework/session/web/http/DefaultCookieSerializerTests.java

@@ -23,7 +23,7 @@ import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Base64;
 
-import jakarta.servlet.http.Cookie;
+import javax.servlet.http.Cookie;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

spring-session-core/src/test/java/org/springframework/session/web/http/OnCommittedResponseWrapperTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -21,25 +21,23 @@ import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.Locale;
 
-import jakarta.servlet.ServletOutputStream;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.MockitoAnnotations;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.verify;
 
-@ExtendWith(MockitoExtension.class)
 class OnCommittedResponseWrapperTests {
 
 	private static final String NL = "\r\n";
 
-	@Mock(lenient = true)
+	@Mock
 	HttpServletResponse delegate;
 
 	@Mock
@@ -54,6 +52,7 @@ class OnCommittedResponseWrapperTests {
 
 	@BeforeEach
 	void setup() throws Exception {
+		MockitoAnnotations.initMocks(this);
 		this.response = new OnCommittedResponseWrapper(this.delegate) {
 			@Override
 			protected void onResponseCommitted() {

spring-session-core/src/test/java/org/springframework/session/web/http/OncePerRequestFilterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2021 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -20,12 +20,12 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import jakarta.servlet.DispatcherType;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.DispatcherType;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;

spring-session-core/src/test/java/org/springframework/session/web/http/SessionEventHttpSessionListenerAdapterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -19,17 +19,16 @@ package org.springframework.session.web.http;
 import java.util.Arrays;
 import java.util.Collections;
 
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.http.HttpSessionEvent;
-import jakarta.servlet.http.HttpSessionListener;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpSessionEvent;
+import javax.servlet.http.HttpSessionListener;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.MockitoAnnotations;
 
 import org.springframework.mock.web.MockServletContext;
 import org.springframework.session.MapSession;
@@ -48,7 +47,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
  * @author Rob Winch
  * @since 1.1
  */
-@ExtendWith(MockitoExtension.class)
 class SessionEventHttpSessionListenerAdapterTests {
 
 	@Mock
@@ -71,6 +69,7 @@ class SessionEventHttpSessionListenerAdapterTests {
 
 	@BeforeEach
 	void setup() {
+		MockitoAnnotations.initMocks(this);
 		this.listener = new SessionEventHttpSessionListenerAdapter(Arrays.asList(this.listener1, this.listener2));
 		this.listener.setServletContext(new MockServletContext());
 

spring-session-core/src/test/java/org/springframework/session/web/http/SessionRepositoryFilterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -30,24 +30,23 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.Cookie;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
-import jakarta.servlet.http.HttpSessionBindingEvent;
-import jakarta.servlet.http.HttpSessionBindingListener;
-import jakarta.servlet.http.HttpSessionContext;
+import javax.servlet.FilterChain;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import javax.servlet.http.HttpSessionBindingEvent;
+import javax.servlet.http.HttpSessionBindingListener;
+import javax.servlet.http.HttpSessionContext;
 
 import org.assertj.core.data.Offset;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.MockitoAnnotations;
 
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.AnnotationAwareOrderComparator;
@@ -79,7 +78,6 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
 /**
  * Tests for {@link SessionRepositoryFilter}.
  */
-@ExtendWith(MockitoExtension.class)
 @SuppressWarnings("deprecation")
 class SessionRepositoryFilterTests {
 
@@ -100,6 +98,7 @@ class SessionRepositoryFilterTests {
 
 	@BeforeEach
 	void setup() {
+		MockitoAnnotations.initMocks(this);
 		this.sessions = new HashMap<>();
 		this.sessionRepository = new MapSessionRepository(this.sessions);
 		this.filter = new SessionRepositoryFilter<>(this.sessionRepository);

spring-session-core/src/test/java/org/springframework/session/web/server/session/SpringSessionWebSessionStoreTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -23,9 +23,8 @@ import java.util.Set;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.MockitoAnnotations;
 import reactor.core.publisher.Mono;
 
 import org.springframework.session.ReactiveSessionRepository;
@@ -44,10 +43,9 @@ import static org.mockito.Mockito.verify;
  * @author Rob Winch
  * @author Vedran Pavic
  */
-@ExtendWith(MockitoExtension.class)
 class SpringSessionWebSessionStoreTests<S extends Session> {
 
-	@Mock(lenient = true)
+	@Mock
 	private ReactiveSessionRepository<S> sessionRepository;
 
 	@Mock
@@ -60,6 +58,7 @@ class SpringSessionWebSessionStoreTests<S extends Session> {
 
 	@BeforeEach
 	void setup() {
+		MockitoAnnotations.initMocks(this);
 		this.webSessionStore = new SpringSessionWebSessionStore<>(this.sessionRepository);
 		given(this.sessionRepository.findById(any())).willReturn(Mono.just(this.findByIdSession));
 		given(this.sessionRepository.createSession()).willReturn(Mono.just(this.createSession));

spring-session-core/src/test/java/org/springframework/session/web/socket/handler/WebSocketConnectHandlerDecoratorFactoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -18,11 +18,10 @@ package org.springframework.session.web.socket.handler;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.MockitoAnnotations;
 
 import org.springframework.context.ApplicationEvent;
 import org.springframework.context.ApplicationEventPublisher;
@@ -36,7 +35,6 @@ import static org.mockito.BDDMockito.willThrow;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.verify;
 
-@ExtendWith(MockitoExtension.class)
 class WebSocketConnectHandlerDecoratorFactoryTests {
 
 	@Mock
@@ -55,6 +53,7 @@ class WebSocketConnectHandlerDecoratorFactoryTests {
 
 	@BeforeEach
 	void setup() {
+		MockitoAnnotations.initMocks(this);
 		this.factory = new WebSocketConnectHandlerDecoratorFactory(this.eventPublisher);
 	}
 

spring-session-core/src/test/java/org/springframework/session/web/socket/handler/WebSocketRegistryListenerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -22,9 +22,8 @@ import java.util.Map;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.MockitoAnnotations;
 
 import org.springframework.messaging.Message;
 import org.springframework.messaging.MessageHeaders;
@@ -45,16 +44,15 @@ import static org.mockito.BDDMockito.given;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-@ExtendWith(MockitoExtension.class)
 class WebSocketRegistryListenerTests {
 
-	@Mock(lenient = true)
+	@Mock
 	private WebSocketSession wsSession;
 
-	@Mock(lenient = true)
+	@Mock
 	private WebSocketSession wsSession2;
 
-	@Mock(lenient = true)
+	@Mock
 	private Message<byte[]> message;
 
 	@Mock
@@ -76,6 +74,7 @@ class WebSocketRegistryListenerTests {
 
 	@BeforeEach
 	void setup() {
+		MockitoAnnotations.initMocks(this);
 		String sessionId = "session-id";
 		MapSession session = new MapSession(sessionId);
 

spring-session-core/src/test/java/org/springframework/session/web/socket/server/SessionRepositoryMessageInterceptorTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -23,14 +23,13 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-import jakarta.servlet.http.HttpSession;
+import javax.servlet.http.HttpSession;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentMatcher;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.MockitoAnnotations;
 
 import org.springframework.http.server.ServletServerHttpRequest;
 import org.springframework.messaging.Message;
@@ -52,10 +51,9 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-@ExtendWith(MockitoExtension.class)
 class SessionRepositoryMessageInterceptorTests {
 
-	@Mock(lenient = true)
+	@Mock
 	SessionRepository<Session> sessionRepository;
 
 	@Mock
@@ -72,6 +70,7 @@ class SessionRepositoryMessageInterceptorTests {
 
 	@BeforeEach
 	void setup() {
+		MockitoAnnotations.initMocks(this);
 		this.interceptor = new SessionRepositoryMessageInterceptor<>(this.sessionRepository);
 		this.headers = SimpMessageHeaderAccessor.create();
 		this.headers.setSessionId("session");

spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/AbstractMongoRepositoryITest.java

@@ -389,13 +389,11 @@ public abstract class AbstractMongoRepositoryITest extends AbstractITest {
 
 	protected static class BaseConfig {
 
-		private static final String DOCKER_IMAGE = "mongo:5.0.11";
+		private static final String DOCKER_IMAGE = "mongo:4.4.1";
 
-		@Bean
-		public MongoDBContainer mongoDbContainer() {
-			MongoDBContainer mongoDbContainer = new MongoDBContainer(DOCKER_IMAGE);
-			mongoDbContainer.start();
-			return mongoDbContainer;
+		@Bean(initMethod = "start", destroyMethod = "stop")
+		public MongoDBContainer mongoContainer() {
+			return new MongoDBContainer(DOCKER_IMAGE).withExposedPorts(27017);
 		}
 
 		@Bean

spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbDeleteJacksonSessionVerificationTest.java

@@ -137,7 +137,6 @@ public class MongoDbDeleteJacksonSessionVerificationTest {
 
 	}
 
-	@Configuration(proxyBeanMethods = false)
 	@EnableWebFluxSecurity
 	static class SecurityConfig {
 
@@ -157,8 +156,9 @@ public class MongoDbDeleteJacksonSessionVerificationTest {
 
 		@Bean
 		MapReactiveUserDetailsService userDetailsService() {
-			return new MapReactiveUserDetailsService(User.withUsername("admin") //
-					.password("{noop}password") //
+			return new MapReactiveUserDetailsService(User.withDefaultPasswordEncoder() //
+					.username("admin") //
+					.password("password") //
 					.roles("USER,ADMIN") //
 					.build());
 		}
@@ -175,13 +175,11 @@ public class MongoDbDeleteJacksonSessionVerificationTest {
 	@EnableMongoWebSession
 	static class Config {
 
-		private static final String DOCKER_IMAGE = "mongo:5.0.11";
+		private static final String DOCKER_IMAGE = "mongo:4.4.1";
 
-		@Bean
-		MongoDBContainer mongoDbContainer() {
-			MongoDBContainer mongoDbContainer = new MongoDBContainer(DOCKER_IMAGE);
-			mongoDbContainer.start();
-			return mongoDbContainer;
+		@Bean(initMethod = "start", destroyMethod = "stop")
+		MongoDBContainer mongoContainer() {
+			return new MongoDBContainer(DOCKER_IMAGE).withExposedPorts(27017);
 		}
 
 		@Bean

spring-session-data-mongodb/src/integration-test/java/org/springframework/session/data/mongo/integration/MongoDbLogoutVerificationTest.java

@@ -135,7 +135,6 @@ public class MongoDbLogoutVerificationTest {
 
 	}
 
-	@Configuration(proxyBeanMethods = false)
 	@EnableWebFluxSecurity
 	static class SecurityConfig {
 
@@ -157,8 +156,9 @@ public class MongoDbLogoutVerificationTest {
 		@Bean
 		MapReactiveUserDetailsService userDetailsService() {
 
-			return new MapReactiveUserDetailsService(User.withUsername("admin") //
-					.password("{noop}password") //
+			return new MapReactiveUserDetailsService(User.withDefaultPasswordEncoder() //
+					.username("admin") //
+					.password("password") //
 					.roles("USER,ADMIN") //
 					.build());
 		}
@@ -170,13 +170,11 @@ public class MongoDbLogoutVerificationTest {
 	@EnableMongoWebSession
 	static class Config {
 
-		private static final String DOCKER_IMAGE = "mongo:5.0.11";
+		private static final String DOCKER_IMAGE = "mongo:4.4.1";
 
-		@Bean
-		MongoDBContainer mongoDbContainer() {
-			MongoDBContainer mongoDbContainer = new MongoDBContainer(DOCKER_IMAGE);
-			mongoDbContainer.start();
-			return mongoDbContainer;
+		@Bean(initMethod = "start", destroyMethod = "stop")
+		MongoDBContainer mongoContainer() {
+			return new MongoDBContainer(DOCKER_IMAGE).withExposedPorts(27017);
 		}
 
 		@Bean

spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/JacksonMongoSessionConverter.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2016 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.
@@ -29,7 +29,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.Module;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 import org.apache.commons.logging.Log;
@@ -168,18 +168,18 @@ public class JacksonMongoSessionConverter extends AbstractMongoSessionConverter
 
 	}
 
-	private static class MongoIdNamingStrategy extends PropertyNamingStrategies.NamingBase {
+	private static class MongoIdNamingStrategy extends PropertyNamingStrategy.PropertyNamingStrategyBase {
 
 		@Override
 		public String translate(String propertyName) {
 
 			switch (propertyName) {
-				case "id":
-					return "_id";
-				case "_id":
-					return "id";
-				default:
-					return propertyName;
+			case "id":
+				return "_id";
+			case "_id":
+				return "id";
+			default:
+				return propertyName;
 			}
 		}
 

spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/MongoOperationsSessionRepository.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2017 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.
@@ -14,24 +14,23 @@
  * limitations under the License.
  */
 
-package org.springframework.session.mongodb.examples.mvc;
+package org.springframework.session.data.mongo;
 
-import java.security.Principal;
-
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.data.mongodb.core.MongoOperations;
 
 /**
- * {@link ControllerAdvice} to expose user related attributes.
+ * This {@link org.springframework.session.FindByIndexNameSessionRepository}
+ * implementation is kept to support backwards compatibility.
  *
  * @author Rob Winch
+ * @since 1.2
+ * @deprecated since 2.2.0 in favor of {@link MongoIndexedSessionRepository}.
  */
-@ControllerAdvice
-public class UserControllerAdvise {
+@Deprecated
+public class MongoOperationsSessionRepository extends MongoIndexedSessionRepository {
 
-	@ModelAttribute("currentUserName")
-	String currentUser(Principal principal) {
-		return (principal != null) ? principal.getName() : null;
+	public MongoOperationsSessionRepository(MongoOperations mongoOperations) {
+		super(mongoOperations);
 	}
 
 }

spring-session-data-mongodb/src/main/java/org/springframework/session/data/mongo/ReactiveMongoOperationsSessionRepository.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2017 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.session.data.mongo;
+
+import org.springframework.data.mongodb.core.ReactiveMongoOperations;
+import org.springframework.session.ReactiveSessionRepository;
+
+/**
+ * This {@link ReactiveSessionRepository} implementation is kept to support migration to
+ * {@link ReactiveMongoSessionRepository} in a backwards compatible manner.
+ *
+ * @author Greg Turnquist
+ * @deprecated since 2.2.0 in favor of {@link ReactiveMongoSessionRepository}.
+ */
+@Deprecated
+public class ReactiveMongoOperationsSessionRepository extends ReactiveMongoSessionRepository {
+
+	public ReactiveMongoOperationsSessionRepository(ReactiveMongoOperations mongoOperations) {
+		super(mongoOperations);
+	}
+
+}

spring-session-data-mongodb/src/test/java/org/springframework/session/data/mongo/AbstractMongoSessionConverterTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2017 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.
@@ -49,7 +49,7 @@ public abstract class AbstractMongoSessionConverterTest {
 		MongoSession deserialized = convertToSession(dbObject);
 
 		// then
-		assertThat(deserialized).usingRecursiveComparison().isEqualTo(toSerialize);
+		assertThat(deserialized).isEqualToComparingFieldByField(toSerialize);
 	}
 
 	@Test
@@ -67,12 +67,14 @@ public abstract class AbstractMongoSessionConverterTest {
 		MongoSession deserialized = convertToSession(serialized);
 
 		// then
-		assertThat(deserialized).usingRecursiveComparison().isEqualTo(toSerialize);
+		assertThat(deserialized).isEqualToComparingOnlyGivenFields(toSerialize, "id", "createdMillis", "accessedMillis",
+				"intervalSeconds", "expireAt");
 
 		SecurityContextImpl springSecurityContextBefore = toSerialize.getAttribute("SPRING_SECURITY_CONTEXT");
 		SecurityContextImpl springSecurityContextAfter = deserialized.getAttribute("SPRING_SECURITY_CONTEXT");
 
-		assertThat(springSecurityContextBefore).usingRecursiveComparison().isEqualTo(springSecurityContextAfter);
+		assertThat(springSecurityContextBefore).isEqualToComparingOnlyGivenFields(springSecurityContextAfter,
+				"authentication.principal", "authentication.authorities", "authentication.authenticated");
 		assertThat(springSecurityContextAfter.getAuthentication().getPrincipal()).isEqualTo("john_the_springer");
 		assertThat(springSecurityContextAfter.getAuthentication().getCredentials()).isNull();
 	}

spring-session-data-redis/spring-session-data-redis.gradle

@@ -13,7 +13,6 @@ dependencies {
 
 	testImplementation "org.assertj:assertj-core"
 	testImplementation "org.mockito:mockito-core"
-	testImplementation "org.mockito:mockito-junit-jupiter"
 	testImplementation "org.springframework:spring-test"
 	testImplementation "io.projectreactor:reactor-test"
 	testImplementation "jakarta.servlet:jakarta.servlet-api"

spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/AbstractRedisITests.java

@@ -29,7 +29,7 @@ import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactor
  */
 public abstract class AbstractRedisITests {
 
-	private static final String DOCKER_IMAGE = "redis:7.0.4-alpine";
+	private static final String DOCKER_IMAGE = "redis:5.0.14";
 
 	protected static class BaseConfig {
 

spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryITests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -39,7 +39,7 @@ import org.springframework.session.Session;
 import org.springframework.session.data.SessionEventRegistry;
 import org.springframework.session.data.redis.RedisIndexedSessionRepository.RedisSession;
 import org.springframework.session.data.redis.config.annotation.SpringSessionRedisOperations;
-import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisIndexedHttpSession;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.session.events.SessionCreatedEvent;
 import org.springframework.session.events.SessionDestroyedEvent;
 import org.springframework.test.context.ContextConfiguration;
@@ -691,7 +691,7 @@ class RedisIndexedSessionRepositoryITests extends AbstractRedisITests {
 	}
 
 	@Configuration
-	@EnableRedisIndexedHttpSession(redisNamespace = "RedisIndexedSessionRepositoryITests")
+	@EnableRedisHttpSession(redisNamespace = "RedisIndexedSessionRepositoryITests")
 	static class Config extends BaseConfig {
 
 		@Bean

spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/RedisSessionRepositoryITests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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,10 +26,13 @@ import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.session.MapSession;
+import org.springframework.session.config.annotation.web.http.EnableSpringHttpSession;
 import org.springframework.session.data.redis.RedisSessionRepository.RedisSession;
-import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -220,9 +223,17 @@ class RedisSessionRepositoryITests extends AbstractRedisITests {
 	}
 
 	@Configuration
-	@EnableRedisHttpSession
+	@EnableSpringHttpSession
 	static class Config extends BaseConfig {
 
+		@Bean
+		RedisSessionRepository sessionRepository(RedisConnectionFactory redisConnectionFactory) {
+			RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+			redisTemplate.setConnectionFactory(redisConnectionFactory);
+			redisTemplate.afterPropertiesSet();
+			return new RedisSessionRepository(redisTemplate);
+		}
+
 	}
 
 }

spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/config/annotation/web/http/EnableRedisHttpSessionExpireSessionDestroyedTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -44,7 +44,7 @@ import static org.assertj.core.api.Assertions.assertThat;
 @ExtendWith(SpringExtension.class)
 @ContextConfiguration
 @WebAppConfiguration
-class EnableRedisIndexedHttpSessionExpireSessionDestroyedTests<S extends Session> extends AbstractRedisITests {
+class EnableRedisHttpSessionExpireSessionDestroyedTests<S extends Session> extends AbstractRedisITests {
 
 	@Autowired
 	private SessionRepository<S> repository;
@@ -113,7 +113,7 @@ class EnableRedisIndexedHttpSessionExpireSessionDestroyedTests<S extends Session
 	}
 
 	@Configuration
-	@EnableRedisIndexedHttpSession(maxInactiveIntervalInSeconds = 1)
+	@EnableRedisHttpSession(maxInactiveIntervalInSeconds = 1)
 	static class Config extends BaseConfig {
 
 		@Bean

spring-session-data-redis/src/integration-test/java/org/springframework/session/data/redis/taskexecutor/RedisListenerContainerTaskExecutorITests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -32,7 +32,7 @@ import org.springframework.data.redis.core.BoundSetOperations;
 import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.session.data.redis.AbstractRedisITests;
 import org.springframework.session.data.redis.config.annotation.SpringSessionRedisOperations;
-import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisIndexedHttpSession;
+import org.springframework.session.data.redis.config.annotation.web.http.EnableRedisHttpSession;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.context.web.WebAppConfiguration;
@@ -101,7 +101,7 @@ class RedisListenerContainerTaskExecutorITests extends AbstractRedisITests {
 	}
 
 	@Configuration
-	@EnableRedisIndexedHttpSession(redisNamespace = "RedisListenerContainerTaskExecutorITests")
+	@EnableRedisHttpSession(redisNamespace = "RedisListenerContainerTaskExecutorITests")
 	static class Config extends BaseConfig {
 
 		@Bean

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

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2014-2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.session.data.redis;
+
+import org.springframework.data.redis.core.ReactiveRedisOperations;
+import org.springframework.session.ReactiveSessionRepository;
+import org.springframework.util.Assert;
+
+/**
+ * This {@link ReactiveSessionRepository} implementation is kept in order to support
+ * migration to {@link ReactiveRedisSessionRepository} in a backwards compatible manner.
+ *
+ * @author Vedran Pavic
+ * @since 2.0.0
+ * @deprecated since 2.2.0 in favor of {@link ReactiveRedisSessionRepository}
+ */
+@Deprecated
+public class ReactiveRedisOperationsSessionRepository extends ReactiveRedisSessionRepository {
+
+	/**
+	 * Create a new {@link ReactiveRedisOperationsSessionRepository} instance.
+	 * @param sessionRedisOperations the {@link ReactiveRedisOperations} to use for
+	 * managing sessions
+	 * @see ReactiveRedisSessionRepository#ReactiveRedisSessionRepository(ReactiveRedisOperations)
+	 */
+	public ReactiveRedisOperationsSessionRepository(ReactiveRedisOperations<String, Object> sessionRedisOperations) {
+		super(sessionRedisOperations);
+	}
+
+	/**
+	 * Sets the redis flush mode. Default flush mode is {@link RedisFlushMode#ON_SAVE}.
+	 * @param redisFlushMode the new redis flush mode
+	 * @deprecated since 2.2.0 as support {@code IMMEDIATE} is removed
+	 */
+	@Deprecated
+	public void setRedisFlushMode(RedisFlushMode redisFlushMode) {
+		Assert.notNull(redisFlushMode, "redisFlushMode cannot be null");
+	}
+
+}

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

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2014-2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.session.data.redis;
+
+import org.springframework.session.FlushMode;
+import org.springframework.session.SessionRepository;
+
+/**
+ * Specifies when to write to the backing Redis instance.
+ *
+ * @author Rob Winch
+ * @since 1.1
+ * @deprecated since 2.2.0 in favor of {@link FlushMode}
+ */
+@Deprecated
+public enum RedisFlushMode {
+
+	/**
+	 * Only writes to Redis when
+	 * {@link SessionRepository#save(org.springframework.session.Session)} is invoked. In
+	 * a web environment this is typically done as soon as the HTTP response is committed.
+	 */
+	ON_SAVE(FlushMode.ON_SAVE),
+
+	/**
+	 * Writes to Redis as soon as possible. For example
+	 * {@link SessionRepository#createSession()} will write the session to Redis. Another
+	 * example is that setting an attribute on the session will also write to Redis
+	 * immediately.
+	 */
+	IMMEDIATE(FlushMode.IMMEDIATE);
+
+	private final FlushMode flushMode;
+
+	RedisFlushMode(FlushMode flushMode) {
+		this.flushMode = flushMode;
+	}
+
+	public FlushMode getFlushMode() {
+		return this.flushMode;
+	}
+
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -288,7 +288,7 @@ public class RedisIndexedSessionRepository
 
 	private byte[] expiredKeyPrefixBytes;
 
-	private final RedisOperations<String, Object> sessionRedisOperations;
+	private final RedisOperations<Object, Object> sessionRedisOperations;
 
 	private final RedisSessionExpirationPolicy expirationPolicy;
 
@@ -314,7 +314,7 @@ public class RedisIndexedSessionRepository
 	 * @param sessionRedisOperations the {@link RedisOperations} to use for managing the
 	 * sessions. Cannot be null.
 	 */
-	public RedisIndexedSessionRepository(RedisOperations<String, Object> sessionRedisOperations) {
+	public RedisIndexedSessionRepository(RedisOperations<Object, Object> sessionRedisOperations) {
 		Assert.notNull(sessionRedisOperations, "sessionRedisOperations cannot be null");
 		this.sessionRedisOperations = sessionRedisOperations;
 		this.expirationPolicy = new RedisSessionExpirationPolicy(sessionRedisOperations, this::getExpirationsKey,
@@ -406,7 +406,7 @@ public class RedisIndexedSessionRepository
 	 * Returns the {@link RedisOperations} used for sessions.
 	 * @return the {@link RedisOperations} used for sessions
 	 */
-	public RedisOperations<String, Object> getSessionRedisOperations() {
+	public RedisOperations<Object, Object> getSessionRedisOperations() {
 		return this.sessionRedisOperations;
 	}
 
@@ -454,7 +454,7 @@ public class RedisIndexedSessionRepository
 	 * @return the Redis session
 	 */
 	private RedisSession getSession(String id, boolean allowExpired) {
-		Map<String, Object> entries = getSessionBoundHashOperations(id).entries();
+		Map<Object, Object> entries = getSessionBoundHashOperations(id).entries();
 		if (entries.isEmpty()) {
 			return null;
 		}
@@ -467,10 +467,10 @@ public class RedisIndexedSessionRepository
 		return result;
 	}
 
-	private MapSession loadSession(String id, Map<String, Object> entries) {
+	private MapSession loadSession(String id, Map<Object, Object> entries) {
 		MapSession loaded = new MapSession(id);
-		for (Map.Entry<String, Object> entry : entries.entrySet()) {
-			String key = entry.getKey();
+		for (Map.Entry<Object, Object> entry : entries.entrySet()) {
+			String key = (String) entry.getKey();
 			if (RedisSessionMapper.CREATION_TIME_KEY.equals(key)) {
 				loaded.setCreationTime(Instant.ofEpochMilli((long) entry.getValue()));
 			}
@@ -522,7 +522,7 @@ public class RedisIndexedSessionRepository
 		if (ByteUtils.startsWith(messageChannel, this.sessionCreatedChannelPrefixBytes)) {
 			// TODO: is this thread safe?
 			@SuppressWarnings("unchecked")
-			Map<String, Object> loaded = (Map<String, Object>) this.defaultSerializer.deserialize(message.getBody());
+			Map<Object, Object> loaded = (Map<Object, Object>) this.defaultSerializer.deserialize(message.getBody());
 			handleCreated(loaded, new String(messageChannel));
 			return;
 		}
@@ -571,7 +571,7 @@ public class RedisIndexedSessionRepository
 		}
 	}
 
-	private void handleCreated(Map<String, Object> loaded, String channel) {
+	private void handleCreated(Map<Object, Object> loaded, String channel) {
 		String id = channel.substring(channel.lastIndexOf(":") + 1);
 		Session session = loadSession(id, loaded);
 		publishEvent(new SessionCreatedEvent(this, session));
@@ -661,7 +661,7 @@ public class RedisIndexedSessionRepository
 	 * @param sessionId the id of the {@link Session} to work with
 	 * @return the {@link BoundHashOperations} to operate on a {@link Session}
 	 */
-	private BoundHashOperations<String, String, Object> getSessionBoundHashOperations(String sessionId) {
+	private BoundHashOperations<Object, Object, Object> getSessionBoundHashOperations(String sessionId) {
 		String key = getSessionKey(sessionId);
 		return this.sessionRedisOperations.boundHashOps(key);
 	}

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

@@ -0,0 +1,57 @@
+/*
+ * Copyright 2014-2019 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.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.session.data.redis;
+
+import org.springframework.data.redis.core.RedisOperations;
+import org.springframework.session.FlushMode;
+import org.springframework.session.SessionRepository;
+import org.springframework.util.Assert;
+
+/**
+ * This {@link SessionRepository} implementation is kept in order to support migration to
+ * {@link RedisIndexedSessionRepository} in a backwards compatible manner.
+ *
+ * @author Rob Winch
+ * @author Vedran Pavic
+ * @since 1.0
+ * @deprecated since 2.2.0 in favor of {@link RedisIndexedSessionRepository}
+ */
+@Deprecated
+public class RedisOperationsSessionRepository extends RedisIndexedSessionRepository {
+
+	/**
+	 * Creates a new instance. For an example, refer to the class level javadoc.
+	 * @param sessionRedisOperations the {@link RedisOperations} to use for managing the
+	 * sessions. Cannot be null.
+	 * @see RedisIndexedSessionRepository#RedisIndexedSessionRepository(RedisOperations)
+	 */
+	public RedisOperationsSessionRepository(RedisOperations<Object, Object> sessionRedisOperations) {
+		super(sessionRedisOperations);
+	}
+
+	/**
+	 * Sets the redis flush mode. Default flush mode is {@link RedisFlushMode#ON_SAVE}.
+	 * @param redisFlushMode the new redis flush mode
+	 * @deprecated since 2.2.0 in favor of {@link #setFlushMode(FlushMode)}
+	 */
+	@Deprecated
+	public void setRedisFlushMode(RedisFlushMode redisFlushMode) {
+		Assert.notNull(redisFlushMode, "redisFlushMode cannot be null");
+		setFlushMode(redisFlushMode.getFlushMode());
+	}
+
+}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -52,13 +52,13 @@ final class RedisSessionExpirationPolicy {
 
 	private static final String SESSION_EXPIRES_PREFIX = "expires:";
 
-	private final RedisOperations<String, Object> redis;
+	private final RedisOperations<Object, Object> redis;
 
 	private final Function<Long, String> lookupExpirationKey;
 
 	private final Function<String, String> lookupSessionKey;
 
-	RedisSessionExpirationPolicy(RedisOperations<String, Object> sessionRedisOperations,
+	RedisSessionExpirationPolicy(RedisOperations<Object, Object> sessionRedisOperations,
 			Function<Long, String> lookupExpirationKey, Function<String, String> lookupSessionKey) {
 		super();
 		this.redis = sessionRedisOperations;
@@ -96,7 +96,7 @@ final class RedisSessionExpirationPolicy {
 		}
 
 		String expireKey = getExpirationKey(toExpire);
-		BoundSetOperations<String, Object> expireOperations = this.redis.boundSetOps(expireKey);
+		BoundSetOperations<Object, Object> expireOperations = this.redis.boundSetOps(expireKey);
 		expireOperations.add(keyToExpire);
 
 		long fiveMinutesAfterExpires = sessionExpireInSeconds + TimeUnit.MINUTES.toSeconds(5);

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

@@ -76,6 +76,17 @@ public class RedisSessionRepository implements SessionRepository<RedisSessionRep
 		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/config/ConfigureNotifyKeyspaceEventsAction.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -65,13 +65,13 @@ public class ConfigureNotifyKeyspaceEventsAction implements ConfigureRedisAction
 			customizedNotifyOptions += "x";
 		}
 		if (!notifyOptions.equals(customizedNotifyOptions)) {
-			connection.serverCommands().setConfig(CONFIG_NOTIFY_KEYSPACE_EVENTS, customizedNotifyOptions);
+			connection.setConfig(CONFIG_NOTIFY_KEYSPACE_EVENTS, customizedNotifyOptions);
 		}
 	}
 
 	private String getNotifyOptions(RedisConnection connection) {
 		try {
-			Properties config = connection.serverCommands().getConfig(CONFIG_NOTIFY_KEYSPACE_EVENTS);
+			Properties config = connection.getConfig(CONFIG_NOTIFY_KEYSPACE_EVENTS);
 			if (config.isEmpty()) {
 				return "";
 			}

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

@@ -1,159 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.session.data.redis.config.annotation.web.http;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.serializer.RedisSerializer;
-import org.springframework.data.redis.serializer.StringRedisSerializer;
-import org.springframework.session.FlushMode;
-import org.springframework.session.MapSession;
-import org.springframework.session.SaveMode;
-import org.springframework.session.Session;
-import org.springframework.session.SessionRepository;
-import org.springframework.session.config.SessionRepositoryCustomizer;
-import org.springframework.session.config.annotation.web.http.SpringHttpSessionConfiguration;
-import org.springframework.session.data.redis.RedisSessionRepository;
-import org.springframework.session.data.redis.config.annotation.SpringSessionRedisConnectionFactory;
-import org.springframework.util.Assert;
-
-/**
- * Base configuration class for Redis based {@link SessionRepository} implementations.
- *
- * @param <T> the {@link SessionRepository} type
- * @author Vedran Pavic
- * @since 3.0.0
- * @see RedisHttpSessionConfiguration
- * @see RedisIndexedHttpSessionConfiguration
- * @see SpringSessionRedisConnectionFactory
- */
-@Configuration(proxyBeanMethods = false)
-public abstract class AbstractRedisHttpSessionConfiguration<T extends SessionRepository<? extends Session>>
-		extends SpringHttpSessionConfiguration implements BeanClassLoaderAware {
-
-	private Integer maxInactiveIntervalInSeconds = MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS;
-
-	private String redisNamespace = RedisSessionRepository.DEFAULT_KEY_NAMESPACE;
-
-	private FlushMode flushMode = FlushMode.ON_SAVE;
-
-	private SaveMode saveMode = SaveMode.ON_SET_ATTRIBUTE;
-
-	private RedisConnectionFactory redisConnectionFactory;
-
-	private RedisSerializer<Object> defaultRedisSerializer;
-
-	private List<SessionRepositoryCustomizer<T>> sessionRepositoryCustomizers;
-
-	private ClassLoader classLoader;
-
-	public abstract T sessionRepository();
-
-	public void setMaxInactiveIntervalInSeconds(int maxInactiveIntervalInSeconds) {
-		this.maxInactiveIntervalInSeconds = maxInactiveIntervalInSeconds;
-	}
-
-	protected Integer getMaxInactiveIntervalInSeconds() {
-		return this.maxInactiveIntervalInSeconds;
-	}
-
-	public void setRedisNamespace(String namespace) {
-		Assert.hasText(namespace, "namespace must not be empty");
-		this.redisNamespace = namespace;
-	}
-
-	protected String getRedisNamespace() {
-		return this.redisNamespace;
-	}
-
-	public void setFlushMode(FlushMode flushMode) {
-		Assert.notNull(flushMode, "flushMode must not be null");
-		this.flushMode = flushMode;
-	}
-
-	protected FlushMode getFlushMode() {
-		return this.flushMode;
-	}
-
-	public void setSaveMode(SaveMode saveMode) {
-		Assert.notNull(saveMode, "saveMode must not be null");
-		this.saveMode = saveMode;
-	}
-
-	protected SaveMode getSaveMode() {
-		return this.saveMode;
-	}
-
-	@Autowired
-	public void setRedisConnectionFactory(
-			@SpringSessionRedisConnectionFactory ObjectProvider<RedisConnectionFactory> springSessionRedisConnectionFactory,
-			ObjectProvider<RedisConnectionFactory> redisConnectionFactory) {
-		this.redisConnectionFactory = springSessionRedisConnectionFactory
-				.getIfAvailable(redisConnectionFactory::getObject);
-	}
-
-	protected RedisConnectionFactory getRedisConnectionFactory() {
-		return this.redisConnectionFactory;
-	}
-
-	@Autowired(required = false)
-	@Qualifier("springSessionDefaultRedisSerializer")
-	public void setDefaultRedisSerializer(RedisSerializer<Object> defaultRedisSerializer) {
-		this.defaultRedisSerializer = defaultRedisSerializer;
-	}
-
-	protected RedisSerializer<Object> getDefaultRedisSerializer() {
-		return this.defaultRedisSerializer;
-	}
-
-	@Autowired(required = false)
-	public void setSessionRepositoryCustomizer(
-			ObjectProvider<SessionRepositoryCustomizer<T>> sessionRepositoryCustomizers) {
-		this.sessionRepositoryCustomizers = sessionRepositoryCustomizers.orderedStream().collect(Collectors.toList());
-	}
-
-	protected List<SessionRepositoryCustomizer<T>> getSessionRepositoryCustomizers() {
-		return this.sessionRepositoryCustomizers;
-	}
-
-	@Override
-	public void setBeanClassLoader(ClassLoader classLoader) {
-		this.classLoader = classLoader;
-	}
-
-	protected RedisTemplate<String, Object> createRedisTemplate() {
-		RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
-		redisTemplate.setKeySerializer(new StringRedisSerializer());
-		redisTemplate.setHashKeySerializer(new StringRedisSerializer());
-		if (getDefaultRedisSerializer() != null) {
-			redisTemplate.setDefaultSerializer(getDefaultRedisSerializer());
-		}
-		redisTemplate.setConnectionFactory(getRedisConnectionFactory());
-		redisTemplate.setBeanClassLoader(this.classLoader);
-		redisTemplate.afterPropertiesSet();
-		return redisTemplate;
-	}
-
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -31,14 +31,15 @@ import org.springframework.session.SaveMode;
 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.RedisSessionRepository;
+import org.springframework.session.data.redis.RedisFlushMode;
+import org.springframework.session.data.redis.RedisIndexedSessionRepository;
 import org.springframework.session.web.http.SessionRepositoryFilter;
 
 /**
  * Add this annotation to an {@code @Configuration} class to expose the
  * {@link SessionRepositoryFilter} as a bean named {@code springSessionRepositoryFilter}
- * and backed by {@link RedisSessionRepository}. In order to leverage the annotation, a
- * single {@link RedisConnectionFactory} must be provided. For example:
+ * and backed by Redis. In order to leverage the annotation, a single
+ * {@link RedisConnectionFactory} must be provided. For example:
  *
  * <pre class="code">
  * &#064;Configuration
@@ -84,7 +85,21 @@ public @interface EnableRedisHttpSession {
 	 * the applications and they could function within the same Redis instance.
 	 * @return the unique namespace for keys
 	 */
-	String redisNamespace() default RedisSessionRepository.DEFAULT_KEY_NAMESPACE;
+	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
@@ -98,6 +113,13 @@ public @interface EnableRedisHttpSession {
 	 */
 	FlushMode flushMode() default FlushMode.ON_SAVE;
 
+	/**
+	 * The cron expression for expired session cleanup job. By default runs every minute.
+	 * @return the session cleanup cron expression
+	 * @since 2.0.0
+	 */
+	String cleanupCron() default RedisHttpSessionConfiguration.DEFAULT_CLEANUP_CRON;
+
 	/**
 	 * 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/EnableRedisIndexedHttpSession.java

@@ -1,113 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.session.data.redis.config.annotation.web.http;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.session.FlushMode;
-import org.springframework.session.MapSession;
-import org.springframework.session.SaveMode;
-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.RedisIndexedSessionRepository;
-import org.springframework.session.web.http.SessionRepositoryFilter;
-
-/**
- * Add this annotation to an {@code @Configuration} class to expose the
- * {@link SessionRepositoryFilter} as a bean named {@code springSessionRepositoryFilter}
- * and backed by {@link RedisIndexedSessionRepository}. In order to leverage the
- * annotation, a single {@link RedisConnectionFactory} must be provided. For example:
- *
- * <pre class="code">
- * &#064;Configuration
- * &#064;EnableRedisIndexedHttpSession
- * public class RedisHttpSessionConfig {
- *
- *     &#064;Bean
- *     public LettuceConnectionFactory redisConnectionFactory() {
- *         return new LettuceConnectionFactory();
- *     }
- *
- * }
- * </pre>
- *
- * More advanced configurations can extend {@link RedisIndexedHttpSessionConfiguration}
- * instead.
- *
- * @author Vedran Pavic
- * @since 3.0.0
- * @see EnableSpringHttpSession
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-@Documented
-@Import(RedisIndexedHttpSessionConfiguration.class)
-@Configuration(proxyBeanMethods = false)
-public @interface EnableRedisIndexedHttpSession {
-
-	/**
-	 * The session timeout in seconds. By default, it is set to 1800 seconds (30 minutes).
-	 * This should be a non-negative integer.
-	 * @return the seconds a session can be inactive before expiring
-	 */
-	int maxInactiveIntervalInSeconds() default MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS;
-
-	/**
-	 * Defines a unique namespace for keys. The value is used to isolate sessions by
-	 * changing the prefix from default {@code spring:session:} to
-	 * {@code <redisNamespace>:}.
-	 * <p>
-	 * For example, if you had an application named "Application A" that needed to keep
-	 * the sessions isolated from "Application B" you could set two different values for
-	 * the applications and they could function within the same Redis instance.
-	 * @return the unique namespace for keys
-	 */
-	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 FlushMode} to use
-	 */
-	FlushMode flushMode() default FlushMode.ON_SAVE;
-
-	/**
-	 * Save mode for the session. The default is {@link SaveMode#ON_SET_ATTRIBUTE}, which
-	 * only saves changes made to session.
-	 * @return the save mode
-	 */
-	SaveMode saveMode() default SaveMode.ON_SET_ATTRIBUTE;
-
-	/**
-	 * The cron expression for expired session cleanup job. By default runs every minute.
-	 * @return the session cleanup cron expression
-	 */
-	String cleanupCron() default RedisIndexedHttpSessionConfiguration.DEFAULT_CLEANUP_CRON;
-
-}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -16,26 +16,62 @@
 
 package org.springframework.session.data.redis.config.annotation.web.http;
 
-import java.time.Duration;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
+import java.util.concurrent.Executor;
+import java.util.stream.Collectors;
 
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.beans.factory.BeanClassLoaderAware;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.ObjectProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.EmbeddedValueResolverAware;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportAware;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.session.data.redis.RedisSessionRepository;
+import org.springframework.data.redis.listener.ChannelTopic;
+import org.springframework.data.redis.listener.PatternTopic;
+import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+import org.springframework.data.redis.serializer.RedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.SchedulingConfigurer;
+import org.springframework.scheduling.config.ScheduledTaskRegistrar;
+import org.springframework.session.FlushMode;
+import org.springframework.session.IndexResolver;
+import org.springframework.session.MapSession;
+import org.springframework.session.SaveMode;
+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;
+import org.springframework.session.data.redis.config.annotation.SpringSessionRedisConnectionFactory;
 import org.springframework.session.web.http.SessionRepositoryFilter;
+import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.util.StringValueResolver;
 
 /**
  * Exposes the {@link SessionRepositoryFilter} as a bean named
- * {@code springSessionRepositoryFilter} backed by {@link RedisSessionRepository}. In
- * order to use this a single {@link RedisConnectionFactory} must be exposed as a Bean.
+ * {@code springSessionRepositoryFilter}. In order to use this a single
+ * {@link RedisConnectionFactory} must be exposed as a Bean.
  *
  * @author Rob Winch
  * @author Eddú Meléndez
@@ -44,47 +80,289 @@ import org.springframework.util.StringValueResolver;
  * @see EnableRedisHttpSession
  */
 @Configuration(proxyBeanMethods = false)
-public class RedisHttpSessionConfiguration extends AbstractRedisHttpSessionConfiguration<RedisSessionRepository>
-		implements EmbeddedValueResolverAware, ImportAware {
+public class RedisHttpSessionConfiguration extends SpringHttpSessionConfiguration
+		implements BeanClassLoaderAware, EmbeddedValueResolverAware, ImportAware {
+
+	static final String DEFAULT_CLEANUP_CRON = "0 * * * * *";
+
+	private Integer maxInactiveIntervalInSeconds = MapSession.DEFAULT_MAX_INACTIVE_INTERVAL_SECONDS;
+
+	private String redisNamespace = RedisIndexedSessionRepository.DEFAULT_NAMESPACE;
+
+	private FlushMode flushMode = FlushMode.ON_SAVE;
+
+	private SaveMode saveMode = SaveMode.ON_SET_ATTRIBUTE;
+
+	private String cleanupCron = DEFAULT_CLEANUP_CRON;
+
+	private ConfigureRedisAction configureRedisAction = new ConfigureNotifyKeyspaceEventsAction();
+
+	private RedisConnectionFactory redisConnectionFactory;
+
+	private IndexResolver<Session> indexResolver;
+
+	private RedisSerializer<Object> defaultRedisSerializer;
+
+	private ApplicationEventPublisher applicationEventPublisher;
+
+	private Executor redisTaskExecutor;
+
+	private Executor redisSubscriptionExecutor;
+
+	private List<SessionRepositoryCustomizer<RedisIndexedSessionRepository>> sessionRepositoryCustomizers;
+
+	private ClassLoader classLoader;
 
 	private StringValueResolver embeddedValueResolver;
 
 	@Bean
-	@Override
-	public RedisSessionRepository sessionRepository() {
-		RedisTemplate<String, Object> redisTemplate = createRedisTemplate();
-		RedisSessionRepository sessionRepository = new RedisSessionRepository(redisTemplate);
-		sessionRepository.setDefaultMaxInactiveInterval(Duration.ofSeconds(getMaxInactiveIntervalInSeconds()));
-		if (StringUtils.hasText(getRedisNamespace())) {
-			sessionRepository.setRedisKeyNamespace(getRedisNamespace());
+	public RedisIndexedSessionRepository sessionRepository() {
+		RedisTemplate<Object, Object> redisTemplate = createRedisTemplate();
+		RedisIndexedSessionRepository sessionRepository = new RedisIndexedSessionRepository(redisTemplate);
+		sessionRepository.setApplicationEventPublisher(this.applicationEventPublisher);
+		if (this.indexResolver != null) {
+			sessionRepository.setIndexResolver(this.indexResolver);
 		}
-		sessionRepository.setFlushMode(getFlushMode());
-		sessionRepository.setSaveMode(getSaveMode());
-		getSessionRepositoryCustomizers()
+		if (this.defaultRedisSerializer != null) {
+			sessionRepository.setDefaultSerializer(this.defaultRedisSerializer);
+		}
+		sessionRepository.setDefaultMaxInactiveInterval(this.maxInactiveIntervalInSeconds);
+		if (StringUtils.hasText(this.redisNamespace)) {
+			sessionRepository.setRedisKeyNamespace(this.redisNamespace);
+		}
+		sessionRepository.setFlushMode(this.flushMode);
+		sessionRepository.setSaveMode(this.saveMode);
+		int database = resolveDatabase();
+		sessionRepository.setDatabase(database);
+		this.sessionRepositoryCustomizers
 				.forEach((sessionRepositoryCustomizer) -> sessionRepositoryCustomizer.customize(sessionRepository));
 		return sessionRepository;
 	}
 
+	@Bean
+	public RedisMessageListenerContainer springSessionRedisMessageListenerContainer(
+			RedisIndexedSessionRepository sessionRepository) {
+		RedisMessageListenerContainer container = new RedisMessageListenerContainer();
+		container.setConnectionFactory(this.redisConnectionFactory);
+		if (this.redisTaskExecutor != null) {
+			container.setTaskExecutor(this.redisTaskExecutor);
+		}
+		if (this.redisSubscriptionExecutor != null) {
+			container.setSubscriptionExecutor(this.redisSubscriptionExecutor);
+		}
+		container.addMessageListener(sessionRepository,
+				Arrays.asList(new ChannelTopic(sessionRepository.getSessionDeletedChannel()),
+						new ChannelTopic(sessionRepository.getSessionExpiredChannel())));
+		container.addMessageListener(sessionRepository,
+				Collections.singletonList(new PatternTopic(sessionRepository.getSessionCreatedChannelPrefix() + "*")));
+		return container;
+	}
+
+	@Bean
+	public InitializingBean enableRedisKeyspaceNotificationsInitializer() {
+		return new EnableRedisKeyspaceNotificationsInitializer(this.redisConnectionFactory, this.configureRedisAction);
+	}
+
+	public void setMaxInactiveIntervalInSeconds(int maxInactiveIntervalInSeconds) {
+		this.maxInactiveIntervalInSeconds = maxInactiveIntervalInSeconds;
+	}
+
+	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;
+	}
+
+	public void setSaveMode(SaveMode saveMode) {
+		this.saveMode = saveMode;
+	}
+
+	public void setCleanupCron(String cleanupCron) {
+		this.cleanupCron = cleanupCron;
+	}
+
+	/**
+	 * Sets the action to perform for configuring Redis.
+	 * @param configureRedisAction the configureRedis to set. The default is
+	 * {@link ConfigureNotifyKeyspaceEventsAction}.
+	 */
+	@Autowired(required = false)
+	public void setConfigureRedisAction(ConfigureRedisAction configureRedisAction) {
+		this.configureRedisAction = configureRedisAction;
+	}
+
+	@Autowired
+	public void setRedisConnectionFactory(
+			@SpringSessionRedisConnectionFactory ObjectProvider<RedisConnectionFactory> springSessionRedisConnectionFactory,
+			ObjectProvider<RedisConnectionFactory> redisConnectionFactory) {
+		RedisConnectionFactory redisConnectionFactoryToUse = springSessionRedisConnectionFactory.getIfAvailable();
+		if (redisConnectionFactoryToUse == null) {
+			redisConnectionFactoryToUse = redisConnectionFactory.getObject();
+		}
+		this.redisConnectionFactory = redisConnectionFactoryToUse;
+	}
+
+	@Autowired(required = false)
+	@Qualifier("springSessionDefaultRedisSerializer")
+	public void setDefaultRedisSerializer(RedisSerializer<Object> defaultRedisSerializer) {
+		this.defaultRedisSerializer = defaultRedisSerializer;
+	}
+
+	@Autowired
+	public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
+		this.applicationEventPublisher = applicationEventPublisher;
+	}
+
+	@Autowired(required = false)
+	public void setIndexResolver(IndexResolver<Session> indexResolver) {
+		this.indexResolver = indexResolver;
+	}
+
+	@Autowired(required = false)
+	@Qualifier("springSessionRedisTaskExecutor")
+	public void setRedisTaskExecutor(Executor redisTaskExecutor) {
+		this.redisTaskExecutor = redisTaskExecutor;
+	}
+
+	@Autowired(required = false)
+	@Qualifier("springSessionRedisSubscriptionExecutor")
+	public void setRedisSubscriptionExecutor(Executor redisSubscriptionExecutor) {
+		this.redisSubscriptionExecutor = redisSubscriptionExecutor;
+	}
+
+	@Autowired(required = false)
+	public void setSessionRepositoryCustomizer(
+			ObjectProvider<SessionRepositoryCustomizer<RedisIndexedSessionRepository>> sessionRepositoryCustomizers) {
+		this.sessionRepositoryCustomizers = sessionRepositoryCustomizers.orderedStream().collect(Collectors.toList());
+	}
+
+	@Override
+	public void setBeanClassLoader(ClassLoader classLoader) {
+		this.classLoader = classLoader;
+	}
+
 	@Override
 	public void setEmbeddedValueResolver(StringValueResolver resolver) {
 		this.embeddedValueResolver = resolver;
 	}
 
 	@Override
+	@SuppressWarnings("deprecation")
 	public void setImportMetadata(AnnotationMetadata importMetadata) {
 		Map<String, Object> attributeMap = importMetadata
 				.getAnnotationAttributes(EnableRedisHttpSession.class.getName());
 		AnnotationAttributes attributes = AnnotationAttributes.fromMap(attributeMap);
-		if (attributes == null) {
-			return;
-		}
-		setMaxInactiveIntervalInSeconds(attributes.getNumber("maxInactiveIntervalInSeconds"));
+		this.maxInactiveIntervalInSeconds = attributes.getNumber("maxInactiveIntervalInSeconds");
 		String redisNamespaceValue = attributes.getString("redisNamespace");
 		if (StringUtils.hasText(redisNamespaceValue)) {
-			setRedisNamespace(this.embeddedValueResolver.resolveStringValue(redisNamespaceValue));
+			this.redisNamespace = this.embeddedValueResolver.resolveStringValue(redisNamespaceValue);
 		}
-		setFlushMode(attributes.getEnum("flushMode"));
-		setSaveMode(attributes.getEnum("saveMode"));
+		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.saveMode = attributes.getEnum("saveMode");
+		String cleanupCron = attributes.getString("cleanupCron");
+		if (StringUtils.hasText(cleanupCron)) {
+			this.cleanupCron = cleanupCron;
+		}
+	}
+
+	private RedisTemplate<Object, Object> createRedisTemplate() {
+		RedisTemplate<Object, Object> redisTemplate = new RedisTemplate<>();
+		redisTemplate.setKeySerializer(new StringRedisSerializer());
+		redisTemplate.setHashKeySerializer(new StringRedisSerializer());
+		if (this.defaultRedisSerializer != null) {
+			redisTemplate.setDefaultSerializer(this.defaultRedisSerializer);
+		}
+		redisTemplate.setConnectionFactory(this.redisConnectionFactory);
+		redisTemplate.setBeanClassLoader(this.classLoader);
+		redisTemplate.afterPropertiesSet();
+		return redisTemplate;
+	}
+
+	private int resolveDatabase() {
+		if (ClassUtils.isPresent("io.lettuce.core.RedisClient", null)
+				&& this.redisConnectionFactory instanceof LettuceConnectionFactory) {
+			return ((LettuceConnectionFactory) this.redisConnectionFactory).getDatabase();
+		}
+		if (ClassUtils.isPresent("redis.clients.jedis.Jedis", null)
+				&& this.redisConnectionFactory instanceof JedisConnectionFactory) {
+			return ((JedisConnectionFactory) this.redisConnectionFactory).getDatabase();
+		}
+		return RedisIndexedSessionRepository.DEFAULT_DATABASE;
+	}
+
+	/**
+	 * Ensures that Redis is configured to send keyspace notifications. This is important
+	 * to ensure that expiration and deletion of sessions trigger SessionDestroyedEvents.
+	 * Without the SessionDestroyedEvent resources may not get cleaned up properly. For
+	 * example, the mapping of the Session to WebSocket connections may not get cleaned
+	 * up.
+	 */
+	static class EnableRedisKeyspaceNotificationsInitializer implements InitializingBean {
+
+		private final RedisConnectionFactory connectionFactory;
+
+		private ConfigureRedisAction configure;
+
+		EnableRedisKeyspaceNotificationsInitializer(RedisConnectionFactory connectionFactory,
+				ConfigureRedisAction configure) {
+			this.connectionFactory = connectionFactory;
+			this.configure = configure;
+		}
+
+		@Override
+		public void afterPropertiesSet() {
+			if (this.configure == ConfigureRedisAction.NO_OP) {
+				return;
+			}
+			RedisConnection connection = this.connectionFactory.getConnection();
+			try {
+				this.configure.configure(connection);
+			}
+			finally {
+				try {
+					connection.close();
+				}
+				catch (Exception ex) {
+					LogFactory.getLog(getClass()).error("Error closing RedisConnection", ex);
+				}
+			}
+		}
+
+	}
+
+	/**
+	 * Configuration of scheduled job for cleaning up expired sessions.
+	 */
+	@EnableScheduling
+	@Configuration(proxyBeanMethods = false)
+	class SessionCleanupConfiguration implements SchedulingConfigurer {
+
+		private final RedisIndexedSessionRepository sessionRepository;
+
+		SessionCleanupConfiguration(RedisIndexedSessionRepository sessionRepository) {
+			this.sessionRepository = sessionRepository;
+		}
+
+		@Override
+		public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
+			taskRegistrar.addCronTask(this.sessionRepository::cleanupExpiredSessions,
+					RedisHttpSessionConfiguration.this.cleanupCron);
+		}
+
 	}
 
 }

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

@@ -1,271 +0,0 @@
-/*
- * 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.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.session.data.redis.config.annotation.web.http;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Map;
-import java.util.concurrent.Executor;
-
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.context.EmbeddedValueResolverAware;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportAware;
-import org.springframework.core.annotation.AnnotationAttributes;
-import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.data.redis.connection.RedisConnection;
-import org.springframework.data.redis.connection.RedisConnectionFactory;
-import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
-import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.listener.ChannelTopic;
-import org.springframework.data.redis.listener.PatternTopic;
-import org.springframework.data.redis.listener.RedisMessageListenerContainer;
-import org.springframework.scheduling.annotation.EnableScheduling;
-import org.springframework.scheduling.annotation.SchedulingConfigurer;
-import org.springframework.scheduling.config.ScheduledTaskRegistrar;
-import org.springframework.session.IndexResolver;
-import org.springframework.session.Session;
-import org.springframework.session.data.redis.RedisIndexedSessionRepository;
-import org.springframework.session.data.redis.config.ConfigureNotifyKeyspaceEventsAction;
-import org.springframework.session.data.redis.config.ConfigureRedisAction;
-import org.springframework.session.web.http.SessionRepositoryFilter;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
-import org.springframework.util.StringValueResolver;
-
-/**
- * Exposes the {@link SessionRepositoryFilter} as a bean named
- * {@code springSessionRepositoryFilter} backed by {@link RedisIndexedSessionRepository}.
- * In order to use this a single {@link RedisConnectionFactory} must be exposed as a Bean.
- *
- * @author Vedran Pavic
- * @since 3.0.0
- * @see EnableRedisIndexedHttpSession
- */
-@Configuration(proxyBeanMethods = false)
-public class RedisIndexedHttpSessionConfiguration
-		extends AbstractRedisHttpSessionConfiguration<RedisIndexedSessionRepository>
-		implements EmbeddedValueResolverAware, ImportAware {
-
-	static final String DEFAULT_CLEANUP_CRON = "0 * * * * *";
-
-	private String cleanupCron = DEFAULT_CLEANUP_CRON;
-
-	private ConfigureRedisAction configureRedisAction = new ConfigureNotifyKeyspaceEventsAction();
-
-	private IndexResolver<Session> indexResolver;
-
-	private ApplicationEventPublisher applicationEventPublisher;
-
-	private Executor redisTaskExecutor;
-
-	private Executor redisSubscriptionExecutor;
-
-	private StringValueResolver embeddedValueResolver;
-
-	@Bean
-	@Override
-	public RedisIndexedSessionRepository sessionRepository() {
-		RedisTemplate<String, Object> redisTemplate = createRedisTemplate();
-		RedisIndexedSessionRepository sessionRepository = new RedisIndexedSessionRepository(redisTemplate);
-		sessionRepository.setApplicationEventPublisher(this.applicationEventPublisher);
-		if (this.indexResolver != null) {
-			sessionRepository.setIndexResolver(this.indexResolver);
-		}
-		if (getDefaultRedisSerializer() != null) {
-			sessionRepository.setDefaultSerializer(getDefaultRedisSerializer());
-		}
-		sessionRepository.setDefaultMaxInactiveInterval(getMaxInactiveIntervalInSeconds());
-		if (StringUtils.hasText(getRedisNamespace())) {
-			sessionRepository.setRedisKeyNamespace(getRedisNamespace());
-		}
-		sessionRepository.setFlushMode(getFlushMode());
-		sessionRepository.setSaveMode(getSaveMode());
-		int database = resolveDatabase();
-		sessionRepository.setDatabase(database);
-		getSessionRepositoryCustomizers()
-				.forEach((sessionRepositoryCustomizer) -> sessionRepositoryCustomizer.customize(sessionRepository));
-		return sessionRepository;
-	}
-
-	@Bean
-	public RedisMessageListenerContainer springSessionRedisMessageListenerContainer(
-			RedisIndexedSessionRepository sessionRepository) {
-		RedisMessageListenerContainer container = new RedisMessageListenerContainer();
-		container.setConnectionFactory(getRedisConnectionFactory());
-		if (this.redisTaskExecutor != null) {
-			container.setTaskExecutor(this.redisTaskExecutor);
-		}
-		if (this.redisSubscriptionExecutor != null) {
-			container.setSubscriptionExecutor(this.redisSubscriptionExecutor);
-		}
-		container.addMessageListener(sessionRepository,
-				Arrays.asList(new ChannelTopic(sessionRepository.getSessionDeletedChannel()),
-						new ChannelTopic(sessionRepository.getSessionExpiredChannel())));
-		container.addMessageListener(sessionRepository,
-				Collections.singletonList(new PatternTopic(sessionRepository.getSessionCreatedChannelPrefix() + "*")));
-		return container;
-	}
-
-	@Bean
-	public InitializingBean enableRedisKeyspaceNotificationsInitializer() {
-		return new EnableRedisKeyspaceNotificationsInitializer(getRedisConnectionFactory(), this.configureRedisAction);
-	}
-
-	public void setCleanupCron(String cleanupCron) {
-		this.cleanupCron = cleanupCron;
-	}
-
-	/**
-	 * Sets the action to perform for configuring Redis.
-	 * @param configureRedisAction the configureRedis to set. The default is
-	 * {@link ConfigureNotifyKeyspaceEventsAction}.
-	 */
-	@Autowired(required = false)
-	public void setConfigureRedisAction(ConfigureRedisAction configureRedisAction) {
-		this.configureRedisAction = configureRedisAction;
-	}
-
-	@Autowired
-	public void setApplicationEventPublisher(ApplicationEventPublisher applicationEventPublisher) {
-		this.applicationEventPublisher = applicationEventPublisher;
-	}
-
-	@Autowired(required = false)
-	public void setIndexResolver(IndexResolver<Session> indexResolver) {
-		this.indexResolver = indexResolver;
-	}
-
-	@Autowired(required = false)
-	@Qualifier("springSessionRedisTaskExecutor")
-	public void setRedisTaskExecutor(Executor redisTaskExecutor) {
-		this.redisTaskExecutor = redisTaskExecutor;
-	}
-
-	@Autowired(required = false)
-	@Qualifier("springSessionRedisSubscriptionExecutor")
-	public void setRedisSubscriptionExecutor(Executor redisSubscriptionExecutor) {
-		this.redisSubscriptionExecutor = redisSubscriptionExecutor;
-	}
-
-	@Override
-	public void setEmbeddedValueResolver(StringValueResolver resolver) {
-		this.embeddedValueResolver = resolver;
-	}
-
-	@Override
-	public void setImportMetadata(AnnotationMetadata importMetadata) {
-		Map<String, Object> attributeMap = importMetadata
-				.getAnnotationAttributes(EnableRedisIndexedHttpSession.class.getName());
-		AnnotationAttributes attributes = AnnotationAttributes.fromMap(attributeMap);
-		if (attributes == null) {
-			return;
-		}
-		setMaxInactiveIntervalInSeconds(attributes.getNumber("maxInactiveIntervalInSeconds"));
-		String redisNamespaceValue = attributes.getString("redisNamespace");
-		if (StringUtils.hasText(redisNamespaceValue)) {
-			setRedisNamespace(this.embeddedValueResolver.resolveStringValue(redisNamespaceValue));
-		}
-		setFlushMode(attributes.getEnum("flushMode"));
-		setSaveMode(attributes.getEnum("saveMode"));
-		String cleanupCron = attributes.getString("cleanupCron");
-		if (StringUtils.hasText(cleanupCron)) {
-			setCleanupCron(cleanupCron);
-		}
-	}
-
-	private int resolveDatabase() {
-		if (ClassUtils.isPresent("io.lettuce.core.RedisClient", null)
-				&& getRedisConnectionFactory() instanceof LettuceConnectionFactory) {
-			return ((LettuceConnectionFactory) getRedisConnectionFactory()).getDatabase();
-		}
-		if (ClassUtils.isPresent("redis.clients.jedis.Jedis", null)
-				&& getRedisConnectionFactory() instanceof JedisConnectionFactory) {
-			return ((JedisConnectionFactory) getRedisConnectionFactory()).getDatabase();
-		}
-		return RedisIndexedSessionRepository.DEFAULT_DATABASE;
-	}
-
-	/**
-	 * Ensures that Redis is configured to send keyspace notifications. This is important
-	 * to ensure that expiration and deletion of sessions trigger SessionDestroyedEvents.
-	 * Without the SessionDestroyedEvent resources may not get cleaned up properly. For
-	 * example, the mapping of the Session to WebSocket connections may not get cleaned
-	 * up.
-	 */
-	static class EnableRedisKeyspaceNotificationsInitializer implements InitializingBean {
-
-		private final RedisConnectionFactory connectionFactory;
-
-		private final ConfigureRedisAction configure;
-
-		EnableRedisKeyspaceNotificationsInitializer(RedisConnectionFactory connectionFactory,
-				ConfigureRedisAction configure) {
-			this.connectionFactory = connectionFactory;
-			this.configure = configure;
-		}
-
-		@Override
-		public void afterPropertiesSet() {
-			if (this.configure == ConfigureRedisAction.NO_OP) {
-				return;
-			}
-			RedisConnection connection = this.connectionFactory.getConnection();
-			try {
-				this.configure.configure(connection);
-			}
-			finally {
-				try {
-					connection.close();
-				}
-				catch (Exception ex) {
-					LogFactory.getLog(getClass()).error("Error closing RedisConnection", ex);
-				}
-			}
-		}
-
-	}
-
-	/**
-	 * Configuration of scheduled job for cleaning up expired sessions.
-	 */
-	@EnableScheduling
-	@Configuration(proxyBeanMethods = false)
-	class SessionCleanupConfiguration implements SchedulingConfigurer {
-
-		private final RedisIndexedSessionRepository sessionRepository;
-
-		SessionCleanupConfiguration(RedisIndexedSessionRepository sessionRepository) {
-			this.sessionRepository = sessionRepository;
-		}
-
-		@Override
-		public void configureTasks(ScheduledTaskRegistrar taskRegistrar) {
-			taskRegistrar.addCronTask(this.sessionRepository::cleanupExpiredSessions,
-					RedisIndexedHttpSessionConfiguration.this.cleanupCron);
-		}
-
-	}
-
-}

spring-session-data-redis/src/main/java/org/springframework/session/data/redis/config/annotation/web/server/EnableRedisWebSession.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2021 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,9 +26,12 @@ import org.springframework.context.annotation.Configuration;
 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;
 
 /**
@@ -83,6 +86,20 @@ public @interface EnableRedisWebSession {
 	 */
 	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/server/RedisWebSessionConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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,7 +41,9 @@ import org.springframework.session.SaveMode;
 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;
@@ -97,6 +99,11 @@ public class RedisWebSessionConfiguration extends SpringWebSessionConfiguration
 		this.redisNamespace = namespace;
 	}
 
+	@Deprecated
+	public void setRedisFlushMode(RedisFlushMode redisFlushMode) {
+		Assert.notNull(redisFlushMode, "redisFlushMode cannot be null");
+	}
+
 	public void setSaveMode(SaveMode saveMode) {
 		this.saveMode = saveMode;
 	}

spring-session-data-redis/src/test/java/org/springframework/session/data/redis/RedisIndexedSessionRepositoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2019 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.
@@ -30,11 +30,10 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.MockitoAnnotations;
 
 import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.data.redis.connection.DefaultMessage;
@@ -66,20 +65,19 @@ import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 
-@ExtendWith(MockitoExtension.class)
 class RedisIndexedSessionRepositoryTests {
 
 	@Mock
-	private RedisOperations<String, Object> redisOperations;
+	private RedisOperations<Object, Object> redisOperations;
 
 	@Mock
-	private BoundValueOperations<String, Object> boundValueOperations;
+	private BoundValueOperations<Object, Object> boundValueOperations;
 
 	@Mock
-	private BoundHashOperations<String, String, Object> boundHashOperations;
+	private BoundHashOperations<Object, Object, Object> boundHashOperations;
 
 	@Mock
-	private BoundSetOperations<String, Object> boundSetOperations;
+	private BoundSetOperations<Object, Object> boundSetOperations;
 
 	@Mock
 	private ApplicationEventPublisher publisher;
@@ -99,6 +97,7 @@ class RedisIndexedSessionRepositoryTests {
 
 	@BeforeEach
 	void setup() {
+		MockitoAnnotations.initMocks(this);
 		this.redisRepository = new RedisIndexedSessionRepository(this.redisOperations);
 		this.redisRepository.setDefaultSerializer(this.defaultSerializer);
 
@@ -116,7 +115,7 @@ class RedisIndexedSessionRepositoryTests {
 
 	@Test
 	void changeSessionIdWhenNotSaved() {
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		given(this.redisOperations.boundValueOps(anyString())).willReturn(this.boundValueOperations);
 
@@ -133,7 +132,7 @@ class RedisIndexedSessionRepositoryTests {
 
 	@Test
 	void changeSessionIdWhenSaved() {
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		given(this.redisOperations.boundValueOps(anyString())).willReturn(this.boundValueOperations);
 
@@ -166,7 +165,7 @@ class RedisIndexedSessionRepositoryTests {
 	@Test
 	void saveNewSession() {
 		RedisSession session = this.redisRepository.createSession();
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		given(this.redisOperations.boundValueOps(anyString())).willReturn(this.boundValueOperations);
 
@@ -201,7 +200,7 @@ class RedisIndexedSessionRepositoryTests {
 				.roundUpToNextMinute(RedisSessionExpirationPolicy.expiresInMillis(session));
 		String destroyedTriggerKey = "spring:session:sessions:expires:" + session.getId();
 
-		given(this.redisOperations.<String, Object>boundHashOps(sessionKey)).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(sessionKey)).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(backgroundExpireKey)).willReturn(this.boundSetOperations);
 		given(this.redisOperations.boundValueOps(destroyedTriggerKey)).willReturn(this.boundValueOperations);
 
@@ -224,7 +223,7 @@ class RedisIndexedSessionRepositoryTests {
 		RedisSession session = this.redisRepository.new RedisSession(this.cached, false);
 		session.setLastAccessedTime(session.getLastAccessedTime());
 
-		given(this.redisOperations.<String, Object>boundHashOps("spring:session:sessions:session-id"))
+		given(this.redisOperations.boundHashOps("spring:session:sessions:session-id"))
 				.willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps("spring:session:expirations:1404361860000"))
 				.willReturn(this.boundSetOperations);
@@ -245,7 +244,7 @@ class RedisIndexedSessionRepositoryTests {
 	void saveLastAccessChanged() {
 		RedisSession session = this.redisRepository.new RedisSession(this.cached, false);
 		session.setLastAccessedTime(Instant.ofEpochMilli(12345678L));
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		given(this.redisOperations.boundValueOps(anyString())).willReturn(this.boundValueOperations);
 
@@ -260,7 +259,7 @@ class RedisIndexedSessionRepositoryTests {
 		String attrName = "attrName";
 		RedisSession session = this.redisRepository.new RedisSession(new MapSession(), false);
 		session.setAttribute(attrName, "attrValue");
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		given(this.redisOperations.boundValueOps(anyString())).willReturn(this.boundValueOperations);
 
@@ -275,7 +274,7 @@ class RedisIndexedSessionRepositoryTests {
 		String attrName = "attrName";
 		RedisSession session = this.redisRepository.new RedisSession(new MapSession(), false);
 		session.removeAttribute(attrName);
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		given(this.redisOperations.boundValueOps(anyString())).willReturn(this.boundValueOperations);
 
@@ -288,7 +287,7 @@ class RedisIndexedSessionRepositoryTests {
 	void saveExpired() {
 		RedisSession session = this.redisRepository.new RedisSession(new MapSession(), false);
 		session.setMaxInactiveInterval(Duration.ZERO);
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 
 		this.redisRepository.save(session);
@@ -316,7 +315,7 @@ class RedisIndexedSessionRepositoryTests {
 		MapSession expected = new MapSession();
 		expected.setLastAccessedTime(Instant.now().minusSeconds(60));
 		expected.setAttribute(attrName, "attrValue");
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		Map map = map(RedisIndexedSessionRepository.getSessionAttrNameKey(attrName), expected.getAttribute(attrName),
 				RedisSessionMapper.CREATION_TIME_KEY, expected.getCreationTime().toEpochMilli(),
@@ -335,7 +334,7 @@ class RedisIndexedSessionRepositoryTests {
 
 	@Test
 	void deleteNullSession() {
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 
 		String id = "abc";
 		this.redisRepository.deleteById(id);
@@ -347,7 +346,7 @@ class RedisIndexedSessionRepositoryTests {
 	@SuppressWarnings("unchecked")
 	void getSessionNotFound() {
 		String id = "abc";
-		given(this.redisOperations.<String, Object>boundHashOps(getKey(id))).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(getKey(id))).willReturn(this.boundHashOperations);
 		given(this.boundHashOperations.entries()).willReturn(map());
 
 		assertThat(this.redisRepository.findById(id)).isNull();
@@ -362,8 +361,7 @@ class RedisIndexedSessionRepositoryTests {
 		expected.setLastAccessedTime(Instant.now().minusSeconds(60));
 		expected.setAttribute(attribute1, "test");
 		expected.setAttribute(attribute2, null);
-		given(this.redisOperations.<String, Object>boundHashOps(getKey(expected.getId())))
-				.willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(getKey(expected.getId()))).willReturn(this.boundHashOperations);
 		Map map = map(RedisIndexedSessionRepository.getSessionAttrNameKey(attribute1),
 				expected.getAttribute(attribute1), RedisIndexedSessionRepository.getSessionAttrNameKey(attribute2),
 				expected.getAttribute(attribute2), RedisSessionMapper.CREATION_TIME_KEY,
@@ -388,8 +386,7 @@ class RedisIndexedSessionRepositoryTests {
 	@SuppressWarnings("unchecked")
 	void getSessionExpired() {
 		String expiredId = "expired-id";
-		given(this.redisOperations.<String, Object>boundHashOps(getKey(expiredId)))
-				.willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(getKey(expiredId))).willReturn(this.boundHashOperations);
 		Map map = map(RedisSessionMapper.MAX_INACTIVE_INTERVAL_KEY, 1, RedisSessionMapper.LAST_ACCESSED_TIME_KEY,
 				Instant.now().minus(5, ChronoUnit.MINUTES).toEpochMilli());
 		given(this.boundHashOperations.entries()).willReturn(map);
@@ -403,8 +400,7 @@ class RedisIndexedSessionRepositoryTests {
 		String expiredId = "expired-id";
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		given(this.boundSetOperations.members()).willReturn(Collections.singleton(expiredId));
-		given(this.redisOperations.<String, Object>boundHashOps(getKey(expiredId)))
-				.willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(getKey(expiredId))).willReturn(this.boundHashOperations);
 		Map map = map(RedisSessionMapper.MAX_INACTIVE_INTERVAL_KEY, 1, RedisSessionMapper.LAST_ACCESSED_TIME_KEY,
 				Instant.now().minus(5, ChronoUnit.MINUTES).toEpochMilli());
 		given(this.boundHashOperations.entries()).willReturn(map);
@@ -423,8 +419,7 @@ class RedisIndexedSessionRepositoryTests {
 		String sessionId = "some-id";
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		given(this.boundSetOperations.members()).willReturn(Collections.singleton(sessionId));
-		given(this.redisOperations.<String, Object>boundHashOps(getKey(sessionId)))
-				.willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(getKey(sessionId))).willReturn(this.boundHashOperations);
 		Map map = map(RedisSessionMapper.CREATION_TIME_KEY, createdTime.toEpochMilli(),
 				RedisSessionMapper.MAX_INACTIVE_INTERVAL_KEY, (int) maxInactive.getSeconds(),
 				RedisSessionMapper.LAST_ACCESSED_TIME_KEY, lastAccessed.toEpochMilli());
@@ -499,8 +494,7 @@ class RedisIndexedSessionRepositoryTests {
 	@SuppressWarnings("unchecked")
 	void onMessageDeletedSessionFound() {
 		String deletedId = "deleted-id";
-		given(this.redisOperations.<String, Object>boundHashOps(getKey(deletedId)))
-				.willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(getKey(deletedId))).willReturn(this.boundHashOperations);
 		Map map = map(RedisSessionMapper.MAX_INACTIVE_INTERVAL_KEY, 0, RedisSessionMapper.LAST_ACCESSED_TIME_KEY,
 				System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(5));
 		given(this.boundHashOperations.entries()).willReturn(map);
@@ -527,8 +521,7 @@ class RedisIndexedSessionRepositoryTests {
 	@SuppressWarnings("unchecked")
 	void onMessageDeletedSessionNotFound() {
 		String deletedId = "deleted-id";
-		given(this.redisOperations.<String, Object>boundHashOps(getKey(deletedId)))
-				.willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(getKey(deletedId))).willReturn(this.boundHashOperations);
 		given(this.boundHashOperations.entries()).willReturn(map());
 
 		String channel = "__keyevent@0__:del";
@@ -551,8 +544,7 @@ class RedisIndexedSessionRepositoryTests {
 	@SuppressWarnings("unchecked")
 	void onMessageExpiredSessionFound() {
 		String expiredId = "expired-id";
-		given(this.redisOperations.<String, Object>boundHashOps(getKey(expiredId)))
-				.willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(getKey(expiredId))).willReturn(this.boundHashOperations);
 		Map map = map(RedisSessionMapper.MAX_INACTIVE_INTERVAL_KEY, 1, RedisSessionMapper.LAST_ACCESSED_TIME_KEY,
 				System.currentTimeMillis() - TimeUnit.MINUTES.toMillis(5));
 		given(this.boundHashOperations.entries()).willReturn(map);
@@ -579,8 +571,7 @@ class RedisIndexedSessionRepositoryTests {
 	@SuppressWarnings("unchecked")
 	void onMessageExpiredSessionNotFound() {
 		String expiredId = "expired-id";
-		given(this.redisOperations.<String, Object>boundHashOps(getKey(expiredId)))
-				.willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(getKey(expiredId))).willReturn(this.boundHashOperations);
 		given(this.boundHashOperations.entries()).willReturn(map());
 
 		String channel = "__keyevent@0__:expired";
@@ -640,7 +631,7 @@ class RedisIndexedSessionRepositoryTests {
 
 	@Test
 	void flushModeImmediateCreate() {
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		given(this.redisOperations.boundValueOps(anyString())).willReturn(this.boundValueOperations);
 
@@ -659,7 +650,7 @@ class RedisIndexedSessionRepositoryTests {
 
 	@Test // gh-1409
 	void flushModeImmediateCreateWithCustomMaxInactiveInterval() {
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		given(this.redisOperations.boundValueOps(anyString())).willReturn(this.boundValueOperations);
 		this.redisRepository.setDefaultMaxInactiveInterval(60);
@@ -672,7 +663,7 @@ class RedisIndexedSessionRepositoryTests {
 
 	@Test
 	void flushModeImmediateSetAttribute() {
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		given(this.redisOperations.boundValueOps(anyString())).willReturn(this.boundValueOperations);
 
@@ -689,7 +680,7 @@ class RedisIndexedSessionRepositoryTests {
 
 	@Test
 	void flushModeImmediateRemoveAttribute() {
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		given(this.redisOperations.boundValueOps(anyString())).willReturn(this.boundValueOperations);
 
@@ -707,7 +698,7 @@ class RedisIndexedSessionRepositoryTests {
 	@Test
 	@SuppressWarnings("unchecked")
 	void flushModeSetMaxInactiveIntervalInSeconds() {
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		given(this.redisOperations.boundValueOps(anyString())).willReturn(this.boundValueOperations);
 
@@ -723,7 +714,7 @@ class RedisIndexedSessionRepositoryTests {
 
 	@Test
 	void flushModeSetLastAccessedTime() {
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		given(this.redisOperations.boundValueOps(anyString())).willReturn(this.boundValueOperations);
 
@@ -750,7 +741,7 @@ class RedisIndexedSessionRepositoryTests {
 		this.redisRepository.setRedisKeyNamespace(namespace);
 		RedisSession session = this.redisRepository.new RedisSession(new MapSession(), false);
 		session.setMaxInactiveInterval(Duration.ZERO);
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 
 		this.redisRepository.save(session);
@@ -840,7 +831,7 @@ class RedisIndexedSessionRepositoryTests {
 
 	@Test
 	void saveWithSaveModeOnSetAttribute() {
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		given(this.redisOperations.boundValueOps(anyString())).willReturn(this.boundValueOperations);
 		this.redisRepository.setSaveMode(SaveMode.ON_SET_ATTRIBUTE);
@@ -857,7 +848,7 @@ class RedisIndexedSessionRepositoryTests {
 
 	@Test
 	void saveWithSaveModeOnGetAttribute() {
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		given(this.redisOperations.boundValueOps(anyString())).willReturn(this.boundValueOperations);
 		this.redisRepository.setSaveMode(SaveMode.ON_GET_ATTRIBUTE);
@@ -874,7 +865,7 @@ class RedisIndexedSessionRepositoryTests {
 
 	@Test
 	void saveWithSaveModeAlways() {
-		given(this.redisOperations.<String, Object>boundHashOps(anyString())).willReturn(this.boundHashOperations);
+		given(this.redisOperations.boundHashOps(anyString())).willReturn(this.boundHashOperations);
 		given(this.redisOperations.boundSetOps(anyString())).willReturn(this.boundSetOperations);
 		given(this.redisOperations.boundValueOps(anyString())).willReturn(this.boundValueOperations);
 		this.redisRepository.setSaveMode(SaveMode.ALWAYS);

spring-session-data-redis/src/test/java/org/springframework/session/data/redis/RedisSessionExpirationPolicyTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2021 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.
@@ -22,9 +22,8 @@ import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.MockitoAnnotations;
 
 import org.springframework.data.redis.core.BoundHashOperations;
 import org.springframework.data.redis.core.BoundSetOperations;
@@ -40,7 +39,6 @@ import static org.mockito.Mockito.verify;
 /**
  * @author Rob Winch
  */
-@ExtendWith(MockitoExtension.class)
 class RedisSessionExpirationPolicyTests {
 
 	// Wed Apr 15 10:28:32 CDT 2015
@@ -49,17 +47,17 @@ class RedisSessionExpirationPolicyTests {
 	// Wed Apr 15 10:27:32 CDT 2015
 	private static final Long ONE_MINUTE_AGO = 1429111652346L;
 
-	@Mock(lenient = true)
-	RedisOperations<String, Object> sessionRedisOperations;
+	@Mock
+	RedisOperations<Object, Object> sessionRedisOperations;
 
 	@Mock
-	BoundSetOperations<String, Object> setOperations;
+	BoundSetOperations<Object, Object> setOperations;
 
 	@Mock
-	BoundHashOperations<String, Object, Object> hashOperations;
+	BoundHashOperations<Object, Object, Object> hashOperations;
 
 	@Mock
-	BoundValueOperations<String, Object> valueOperations;
+	BoundValueOperations<Object, Object> valueOperations;
 
 	private RedisSessionExpirationPolicy policy;
 
@@ -67,6 +65,7 @@ class RedisSessionExpirationPolicyTests {
 
 	@BeforeEach
 	void setup() {
+		MockitoAnnotations.initMocks(this);
 		RedisIndexedSessionRepository repository = new RedisIndexedSessionRepository(this.sessionRedisOperations);
 		this.policy = new RedisSessionExpirationPolicy(this.sessionRedisOperations, repository::getExpirationsKey,
 				repository::getSessionKey);

spring-session-data-redis/src/test/java/org/springframework/session/data/redis/RedisSessionRepositoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2020 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,11 +26,10 @@ import java.util.Map;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Captor;
 import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
+import org.mockito.MockitoAnnotations;
 
 import org.springframework.data.redis.core.HashOperations;
 import org.springframework.data.redis.core.RedisOperations;
@@ -53,14 +52,13 @@ import static org.mockito.Mockito.verifyNoMoreInteractions;
  *
  * @author Vedran Pavic
  */
-@ExtendWith(MockitoExtension.class)
 class RedisSessionRepositoryTests {
 
 	private static final String TEST_SESSION_ID = "session-id";
 
 	private static final String TEST_SESSION_KEY = getSessionKey(TEST_SESSION_ID);
 
-	@Mock(lenient = true)
+	@Mock
 	private RedisOperations<String, Object> sessionRedisOperations;
 
 	@Mock
@@ -73,6 +71,7 @@ class RedisSessionRepositoryTests {
 
 	@BeforeEach
 	void setUp() {
+		MockitoAnnotations.initMocks(this);
 		given(this.sessionRedisOperations.<String, Object>opsForHash()).willReturn(this.sessionHashOperations);
 		this.sessionRepository = new RedisSessionRepository(this.sessionRedisOperations);
 	}
@@ -97,18 +96,36 @@ class RedisSessionRepositoryTests {
 				.withMessage("defaultMaxInactiveInterval must not be null");
 	}
 
+	@Test
+	void setKeyNamespace_ValidNamespace_ShouldSetNamespace() {
+		this.sessionRepository.setKeyNamespace("test:");
+		assertThat(ReflectionTestUtils.getField(this.sessionRepository, "keyNamespace")).isEqualTo("test:");
+	}
+
 	@Test
 	void setRedisKeyNamespace_ValidNamespace_ShouldSetNamespace() {
 		this.sessionRepository.setRedisKeyNamespace("test");
 		assertThat(ReflectionTestUtils.getField(this.sessionRepository, "keyNamespace")).isEqualTo("test:");
 	}
 
+	@Test
+	void setKeyNamespace_NullNamespace_ShouldThrowException() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.sessionRepository.setKeyNamespace(null))
+				.withMessage("keyNamespace must not be empty");
+	}
+
 	@Test
 	void setRedisKeyNamespace_NullNamespace_ShouldThrowException() {
 		assertThatIllegalArgumentException().isThrownBy(() -> this.sessionRepository.setRedisKeyNamespace(null))
 				.withMessage("namespace must not be empty");
 	}
 
+	@Test
+	void setKeyNamespace_EmptyNamespace_ShouldThrowException() {
+		assertThatIllegalArgumentException().isThrownBy(() -> this.sessionRepository.setKeyNamespace(" "))
+				.withMessage("keyNamespace must not be empty");
+	}
+
 	@Test
 	void setRedisKeyNamespace_EmptyNamespace_ShouldThrowException() {
 		assertThatIllegalArgumentException().isThrownBy(() -> this.sessionRepository.setRedisKeyNamespace(" "))