Merge branch '3.1.x' into 3.2.x

Author: marcusdacoregio

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

@@ -20,13 +20,11 @@
 import java.util.Map;
 import java.util.function.BiFunction;
 
-import io.lettuce.core.RedisCommandExecutionException;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.data.redis.RedisSystemException;
 import org.springframework.data.redis.core.BoundHashOperations;
 import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.session.MapSession;
@@ -43,7 +41,6 @@
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.BDDMockito.given;
 import static org.mockito.BDDMockito.willAnswer;
-import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.spy;
 
 /**
@@ -99,30 +96,6 @@ void findByIdWhenSessionDeletedWhileSavingDeltaAndSafeMapperThenSessionIsNull()
 		assertThat(this.sessionRepository.findById(session.getId())).isNull();
 	}
 
-	// gh-1743
-	@Test
-	@SuppressWarnings("unchecked")
-	void saveChangeSessionIdWhenFailedRenameOperationExceptionContainsMoreDetailsThenIgnoreError() {
-		this.context.register(Config.class);
-		refreshAndPrepareFields();
-
-		RedisSession toSave = this.sessionRepository.createSession();
-		String sessionId = toSave.getId();
-
-		this.sessionRepository.save(toSave);
-		RedisSession session = this.sessionRepository.findById(sessionId);
-		this.sessionRepository.deleteById(sessionId);
-		String newSessionId = session.changeSessionId();
-
-		RedisSystemException redisSystemException = new RedisSystemException(null,
-				new RedisCommandExecutionException("ERR no such key. channel: [id: 0xec125091,..."));
-		doThrow(redisSystemException).when(this.spyOperations).rename(any(), any());
-
-		this.sessionRepository.save(session);
-		assertThat(this.sessionRepository.findById(sessionId)).isNull();
-		assertThat(this.sessionRepository.findById(newSessionId)).isNull();
-	}
-
 	@SuppressWarnings("unchecked")
 	private void refreshAndPrepareFields() {
 		this.context.refresh();

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

@@ -47,6 +47,7 @@
 import org.springframework.test.context.web.WebAppConfiguration;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatNoException;
 
 /**
  * Integration tests for {@link RedisIndexedSessionRepository}.
@@ -682,6 +683,20 @@ void changeSessionIdSaveConcurrently() {
 		assertThat(this.repository.findById(copy2.getId())).isNull();
 	}
 
+	// gh-1743
+	@Test
+	void saveChangeSessionIdWhenFailedRenameOperationExceptionThenIgnoreError() {
+		RedisSession toSave = this.repository.createSession();
+		String sessionId = toSave.getId();
+
+		this.repository.save(toSave);
+		RedisSession session = this.repository.findById(sessionId);
+		this.repository.deleteById(sessionId);
+		session.changeSessionId();
+
+		assertThatNoException().isThrownBy(() -> this.repository.save(session));
+	}
+
 	private String getSecurityName() {
 		return this.context.getAuthentication().getName();
 	}