Fix deprecation warnings

spring-session-docs/modules/ROOT/examples/java/docs/FindByIndexNameSessionRepositoryTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,10 +18,10 @@ package docs;
 
 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.MockitoAnnotations;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 import org.springframework.session.FindByIndexNameSessionRepository;
 import org.springframework.session.Session;
@@ -30,6 +30,7 @@ import org.springframework.session.Session;
  * @author Rob Winch
  *
  */
+@ExtendWith(MockitoExtension.class)
 class FindByIndexNameSessionRepositoryTests {
 
 	@Mock
@@ -38,11 +39,6 @@ class FindByIndexNameSessionRepositoryTests {
 	@Mock
 	Session session;
 
-	@BeforeEach
-	void setUp() {
-		MockitoAnnotations.initMocks(this);
-	}
-
 	@Test
 	void setUsername() {
 		// tag::set-username[]
@@ -52,7 +48,6 @@ class FindByIndexNameSessionRepositoryTests {
 	}
 
 	@Test
-	@SuppressWarnings("unused")
 	void findByUsername() {
 		// tag::findby-username[]
 		String username = "username";

spring-session-docs/modules/ROOT/examples/java/docs/http/AbstractHttpSessionListenerTests.java

@@ -26,6 +26,7 @@ import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.context.ApplicationListener;
 import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.RedisServerCommands;
 import org.springframework.data.redis.connection.SubscriptionListener;
 import org.springframework.security.core.session.SessionDestroyedEvent;
 import org.springframework.session.MapSession;
@@ -67,9 +68,11 @@ public abstract class AbstractHttpSessionListenerTests {
 	static RedisConnectionFactory createMockRedisConnection() {
 		RedisConnectionFactory factory = mock(RedisConnectionFactory.class);
 		RedisConnection connection = mock(RedisConnection.class);
+		RedisServerCommands commands = mock(RedisServerCommands.class);
 
 		given(factory.getConnection()).willReturn(connection);
-		given(connection.getConfig(anyString())).willReturn(new Properties());
+		given(connection.serverCommands()).willReturn(commands);
+		given(commands.getConfig(anyString())).willReturn(new Properties());
 
 		willAnswer((it) -> {
 			SubscriptionListener listener = it.getArgument(0);

spring-session-docs/modules/ROOT/examples/java/docs/security/RememberMeSecurityConfiguration.java

@@ -23,9 +23,9 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.provisioning.InMemoryUserDetailsManager;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.session.MapSessionRepository;
 import org.springframework.session.config.annotation.web.http.EnableSpringHttpSession;
 import org.springframework.session.security.web.authentication.SpringSessionRememberMeServices;
@@ -36,12 +36,12 @@ import org.springframework.session.security.web.authentication.SpringSessionReme
 @Configuration(proxyBeanMethods = false)
 @EnableWebSecurity
 @EnableSpringHttpSession
-public class RememberMeSecurityConfiguration extends WebSecurityConfigurerAdapter {
+public class RememberMeSecurityConfiguration {
 
 	// @formatter:off
 	// tag::http-rememberme[]
-	@Override
-	protected void configure(HttpSecurity http) throws Exception {
+	@Bean
+	SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 		http
 			// ... additional configuration ...
 			.rememberMe((rememberMe) -> rememberMe
@@ -49,11 +49,11 @@ public class RememberMeSecurityConfiguration extends WebSecurityConfigurerAdapte
 			);
 		// end::http-rememberme[]
 
-		http
+		return http
 			.formLogin(Customizer.withDefaults())
 			.authorizeRequests((authorize) -> authorize
 				.anyRequest().authenticated()
-			);
+			).build();
 	}
 
 	// tag::rememberme-bean[]
@@ -68,7 +68,6 @@ public class RememberMeSecurityConfiguration extends WebSecurityConfigurerAdapte
 	// end::rememberme-bean[]
 	// @formatter:on
 
-	@Override
 	@Bean
 	public InMemoryUserDetailsManager userDetailsService() {
 		return new InMemoryUserDetailsManager(

spring-session-docs/modules/ROOT/examples/java/docs/security/SecurityConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2019 the original author or authors.
+ * Copyright 2014-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.session.FindByIndexNameSessionRepository;
 import org.springframework.session.Session;
 import org.springframework.session.security.SpringSessionBackedSessionRegistry;
@@ -30,20 +30,21 @@ import org.springframework.session.security.SpringSessionBackedSessionRegistry;
  */
 // tag::class[]
 @Configuration
-public class SecurityConfiguration<S extends Session> extends WebSecurityConfigurerAdapter {
+public class SecurityConfiguration<S extends Session> {
 
 	@Autowired
 	private FindByIndexNameSessionRepository<S> sessionRepository;
 
-	@Override
-	protected void configure(HttpSecurity http) throws Exception {
+	@Bean
+	SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
 		// @formatter:off
-		http
+		return http
 			// other config goes here...
 			.sessionManagement((sessionManagement) -> sessionManagement
 				.maximumSessions(2)
 				.sessionRegistry(sessionRegistry())
-			);
+			)
+			.build();
 		// @formatter:on
 	}