From ff50753777c7e86c95adf5b0e4077eccd238b908 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 17 Jul 2023 14:03:06 -0700 Subject: [PATCH 1/2] Prepare issue branch for 2494 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a67dc48660..12b3b5b94d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.data spring-data-redis - 3.2.0-SNAPSHOT + 3.2.0-GH-2494-SNAPSHOT Spring Data Redis Spring Data module for Redis From 951b10cf31813d2bd9a6470c3e03240f2f0347fd Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 17 Jul 2023 14:03:37 -0700 Subject: [PATCH 2/2] Make RedisAccessor abstract. Closes #2494 --- .../springframework/data/redis/core/RedisAccessor.java | 2 +- .../data/redis/core/RedisAccessorUnitTests.java | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/data/redis/core/RedisAccessor.java b/src/main/java/org/springframework/data/redis/core/RedisAccessor.java index 93b4fef34c..903cef1f37 100644 --- a/src/main/java/org/springframework/data/redis/core/RedisAccessor.java +++ b/src/main/java/org/springframework/data/redis/core/RedisAccessor.java @@ -29,7 +29,7 @@ * @author John Blum * @see org.springframework.beans.factory.InitializingBean */ -public class RedisAccessor implements InitializingBean { +public abstract class RedisAccessor implements InitializingBean { /** Logger available to subclasses */ protected final Log logger = LogFactory.getLog(getClass()); diff --git a/src/test/java/org/springframework/data/redis/core/RedisAccessorUnitTests.java b/src/test/java/org/springframework/data/redis/core/RedisAccessorUnitTests.java index ccbfb2e51d..c427030e94 100644 --- a/src/test/java/org/springframework/data/redis/core/RedisAccessorUnitTests.java +++ b/src/test/java/org/springframework/data/redis/core/RedisAccessorUnitTests.java @@ -41,7 +41,7 @@ void setAndGetConnectionFactory() { RedisConnectionFactory mockConnectionFactory = mock(RedisConnectionFactory.class); - RedisAccessor redisAccessor = new RedisAccessor(); + RedisAccessor redisAccessor = new TestRedisAccessor(); assertThat(redisAccessor.getConnectionFactory()).isNull(); @@ -61,7 +61,7 @@ void setAndGetConnectionFactory() { void getRequiredConnectionFactoryWhenNull() { assertThatIllegalStateException() - .isThrownBy(() -> new RedisAccessor().getRequiredConnectionFactory()) + .isThrownBy(() -> new TestRedisAccessor().getRequiredConnectionFactory()) .withMessage("RedisConnectionFactory is required") .withNoCause(); } @@ -71,7 +71,7 @@ void afterPropertiesSetCallsGetRequiredConnectionFactory() { RedisConnectionFactory mockConnectionFactory = mock(RedisConnectionFactory.class); - RedisAccessor redisAccessor = spy(new RedisAccessor()); + RedisAccessor redisAccessor = spy(new TestRedisAccessor()); doReturn(mockConnectionFactory).when(redisAccessor).getRequiredConnectionFactory(); @@ -81,4 +81,7 @@ void afterPropertiesSetCallsGetRequiredConnectionFactory() { verify(redisAccessor, times(1)).getRequiredConnectionFactory(); verifyNoMoreInteractions(redisAccessor); } + + static class TestRedisAccessor extends RedisAccessor { } + }