Skip to content

Commit 951b10c

Browse files
committed
Make RedisAccessor abstract.
Closes spring-projects#2494
1 parent ff50753 commit 951b10c

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/main/java/org/springframework/data/redis/core/RedisAccessor.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @author John Blum
3030
* @see org.springframework.beans.factory.InitializingBean
3131
*/
32-
public class RedisAccessor implements InitializingBean {
32+
public abstract class RedisAccessor implements InitializingBean {
3333

3434
/** Logger available to subclasses */
3535
protected final Log logger = LogFactory.getLog(getClass());

src/test/java/org/springframework/data/redis/core/RedisAccessorUnitTests.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void setAndGetConnectionFactory() {
4141

4242
RedisConnectionFactory mockConnectionFactory = mock(RedisConnectionFactory.class);
4343

44-
RedisAccessor redisAccessor = new RedisAccessor();
44+
RedisAccessor redisAccessor = new TestRedisAccessor();
4545

4646
assertThat(redisAccessor.getConnectionFactory()).isNull();
4747

@@ -61,7 +61,7 @@ void setAndGetConnectionFactory() {
6161
void getRequiredConnectionFactoryWhenNull() {
6262

6363
assertThatIllegalStateException()
64-
.isThrownBy(() -> new RedisAccessor().getRequiredConnectionFactory())
64+
.isThrownBy(() -> new TestRedisAccessor().getRequiredConnectionFactory())
6565
.withMessage("RedisConnectionFactory is required")
6666
.withNoCause();
6767
}
@@ -71,7 +71,7 @@ void afterPropertiesSetCallsGetRequiredConnectionFactory() {
7171

7272
RedisConnectionFactory mockConnectionFactory = mock(RedisConnectionFactory.class);
7373

74-
RedisAccessor redisAccessor = spy(new RedisAccessor());
74+
RedisAccessor redisAccessor = spy(new TestRedisAccessor());
7575

7676
doReturn(mockConnectionFactory).when(redisAccessor).getRequiredConnectionFactory();
7777

@@ -81,4 +81,7 @@ void afterPropertiesSetCallsGetRequiredConnectionFactory() {
8181
verify(redisAccessor, times(1)).getRequiredConnectionFactory();
8282
verifyNoMoreInteractions(redisAccessor);
8383
}
84+
85+
static class TestRedisAccessor extends RedisAccessor { }
86+
8487
}

0 commit comments

Comments
 (0)