From b8a9d5fa0a1d5d9988cfab7d8f4141b0ad144794 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 18 Jul 2023 09:25:54 +0200 Subject: [PATCH] Polishing. Use standard assertions. Tweak Javadoc wording. See #2494 Original pull request: #2645 --- .../springframework/data/redis/core/RedisAccessor.java | 10 ++++++---- 1 file changed, 6 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 903cef1f3..c326f2b9e 100644 --- a/src/main/java/org/springframework/data/redis/core/RedisAccessor.java +++ b/src/main/java/org/springframework/data/redis/core/RedisAccessor.java @@ -19,15 +19,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.data.redis.connection.RedisConnectionFactory; -import org.springframework.data.redis.util.RedisAssertions; import org.springframework.lang.Nullable; +import org.springframework.util.Assert; /** - * Base class for {@link RedisTemplate} defining common properties. Not intended to be used directly. + * Base class for {@link RedisTemplate} implementations defining common properties. Not intended to be used directly. * * @author Costin Leau * @author John Blum - * @see org.springframework.beans.factory.InitializingBean */ public abstract class RedisAccessor implements InitializingBean { @@ -62,7 +61,10 @@ public abstract class RedisAccessor implements InitializingBean { * @since 2.0 */ public RedisConnectionFactory getRequiredConnectionFactory() { - return RedisAssertions.requireState(getConnectionFactory(), "RedisConnectionFactory is required"); + + RedisConnectionFactory connectionFactory = getConnectionFactory(); + Assert.state(connectionFactory != null, "RedisConnectionFactory is required"); + return connectionFactory; } /**