Merge branch '3.1.x'

Author: marcusdacoregio

etc/checkstyle/suppressions.xml

@@ -8,4 +8,5 @@
 	<suppress files="[\\/]spring-session-samples[\\/]" checks="Javadoc*"/>
 	<suppress files="[\\/]spring-session-samples[\\/].+Application\.java" checks="HideUtilityClassConstructor"/>
 	<suppress files="CookieSerializer\.java" checks="SpringMethodVisibility"/>
+	<suppress files="RedisIndexedSessionRepositoryDynamicITests\.java" checks="RegexpSinglelineJava"/>
 </suppressions>

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

@@ -43,7 +43,7 @@
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.willAnswer;
-import static org.mockito.BDDMockito.willThrow;
+import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.spy;
 
 /**
@@ -116,7 +116,7 @@ void saveChangeSessionIdWhenFailedRenameOperationExceptionContainsMoreDetailsThe
 
 		RedisSystemException redisSystemException = new RedisSystemException(null,
 				new RedisCommandExecutionException("ERR no such key. channel: [id: 0xec125091,..."));
-		willThrow(redisSystemException).given(this.spyOperations).rename(any(), any());
+		doThrow(redisSystemException).when(this.spyOperations).rename(any(), any());
 
 		this.sessionRepository.save(session);
 		assertThat(this.sessionRepository.findById(sessionId)).isNull();