diff --git a/src/main/java/org/springframework/data/redis/cache/RedisCacheManager.java b/src/main/java/org/springframework/data/redis/cache/RedisCacheManager.java index d1a8a805b..101ef98e3 100644 --- a/src/main/java/org/springframework/data/redis/cache/RedisCacheManager.java +++ b/src/main/java/org/springframework/data/redis/cache/RedisCacheManager.java @@ -178,10 +178,10 @@ public class RedisCacheManager extends AbstractTransactionSupportingCacheManager private RedisCacheManager(RedisCacheWriter cacheWriter, RedisCacheConfiguration defaultCacheConfiguration, boolean allowRuntimeCacheCreation) { - this.defaultCacheConfiguration = RedisAssertions.requireObject(defaultCacheConfiguration, + this.defaultCacheConfiguration = RedisAssertions.requireNonNull(defaultCacheConfiguration, "DefaultCacheConfiguration must not be null"); - this.cacheWriter = RedisAssertions.requireObject(cacheWriter, "CacheWriter must not be null"); + this.cacheWriter = RedisAssertions.requireNonNull(cacheWriter, "CacheWriter must not be null"); this.initialCacheConfiguration = new LinkedHashMap<>(); this.allowRuntimeCacheCreation = allowRuntimeCacheCreation; } @@ -410,7 +410,7 @@ public class RedisCacheManager extends AbstractTransactionSupportingCacheManager * @see org.springframework.data.redis.cache.RedisCacheWriter */ public static RedisCacheManagerBuilder fromCacheWriter(RedisCacheWriter cacheWriter) { - return new RedisCacheManagerBuilder(RedisAssertions.requireObject(cacheWriter, + return new RedisCacheManagerBuilder(RedisAssertions.requireNonNull(cacheWriter, "CacheWriter must not be null")); } @@ -427,7 +427,7 @@ public class RedisCacheManager extends AbstractTransactionSupportingCacheManager public static RedisCacheManagerBuilder fromConnectionFactory(RedisConnectionFactory connectionFactory) { RedisCacheWriter cacheWriter = RedisCacheWriter.nonLockingRedisCacheWriter( - RedisAssertions.requireObject(connectionFactory, "ConnectionFactory must not be null")); + RedisAssertions.requireNonNull(connectionFactory, "ConnectionFactory must not be null")); return new RedisCacheManagerBuilder(cacheWriter); } @@ -506,7 +506,7 @@ public class RedisCacheManager extends AbstractTransactionSupportingCacheManager */ public RedisCacheManagerBuilder cacheDefaults(RedisCacheConfiguration defaultCacheConfiguration) { - this.defaultCacheConfiguration = RedisAssertions.requireObject(defaultCacheConfiguration, + this.defaultCacheConfiguration = RedisAssertions.requireNonNull(defaultCacheConfiguration, "DefaultCacheConfiguration must not be null"); return this; @@ -520,7 +520,7 @@ public class RedisCacheManager extends AbstractTransactionSupportingCacheManager * @since 2.3 */ public RedisCacheManagerBuilder cacheWriter(RedisCacheWriter cacheWriter) { - this.cacheWriter = RedisAssertions.requireObject(cacheWriter, "CacheWriter must not be null"); + this.cacheWriter = RedisAssertions.requireNonNull(cacheWriter, "CacheWriter must not be null"); return this; } @@ -544,7 +544,7 @@ public class RedisCacheManager extends AbstractTransactionSupportingCacheManager */ public RedisCacheManagerBuilder initialCacheNames(Set cacheNames) { - RedisAssertions.requireObject(cacheNames, "CacheNames must not be null") + RedisAssertions.requireNonNull(cacheNames, "CacheNames must not be null") .forEach(it -> withCacheConfiguration(it, defaultCacheConfiguration)); return this; @@ -589,8 +589,8 @@ public class RedisCacheManager extends AbstractTransactionSupportingCacheManager public RedisCacheManagerBuilder withInitialCacheConfigurations( Map cacheConfigurations) { - RedisAssertions.requireObject(cacheConfigurations, "CacheConfigurations must not be null") - .forEach((cacheName, cacheConfiguration) -> RedisAssertions.requireObject(cacheConfiguration, + RedisAssertions.requireNonNull(cacheConfigurations, "CacheConfigurations must not be null") + .forEach((cacheName, cacheConfiguration) -> RedisAssertions.requireNonNull(cacheConfiguration, "RedisCacheConfiguration for cache [%s] must not be null", cacheName)); this.initialCaches.putAll(cacheConfigurations); diff --git a/src/main/java/org/springframework/data/redis/connection/RedisClusterNode.java b/src/main/java/org/springframework/data/redis/connection/RedisClusterNode.java index 3c6bd7020..acc4fe43d 100644 --- a/src/main/java/org/springframework/data/redis/connection/RedisClusterNode.java +++ b/src/main/java/org/springframework/data/redis/connection/RedisClusterNode.java @@ -76,7 +76,7 @@ public class RedisClusterNode extends RedisNode { this(SlotRange.empty()); - this.id = RedisAssertions.requireObject(id, "Id must not be null"); + this.id = RedisAssertions.requireNonNull(id, "Id must not be null"); } /** @@ -87,7 +87,7 @@ public class RedisClusterNode extends RedisNode { public RedisClusterNode(SlotRange slotRange) { this.flags = Collections.emptySet(); - this.slotRange = RedisAssertions.requireObject(slotRange,"SlotRange must not be null"); + this.slotRange = RedisAssertions.requireNonNull(slotRange,"SlotRange must not be null"); } /** @@ -102,7 +102,7 @@ public class RedisClusterNode extends RedisNode { super(host, port); this.flags = Collections.emptySet(); - this.slotRange = RedisAssertions.requireObject(slotRange,"SlotRange must not be null"); + this.slotRange = RedisAssertions.requireNonNull(slotRange,"SlotRange must not be null"); } /** diff --git a/src/main/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializer.java b/src/main/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializer.java index 72a9606ec..4bb09ceaa 100644 --- a/src/main/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializer.java +++ b/src/main/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializer.java @@ -180,9 +180,9 @@ public class GenericJackson2JsonRedisSerializer implements RedisSerializer mapper.getSerializationConfig() .getDefaultTyper(null) != null); diff --git a/src/main/java/org/springframework/data/redis/serializer/JdkSerializationRedisSerializer.java b/src/main/java/org/springframework/data/redis/serializer/JdkSerializationRedisSerializer.java index f0b54717f..310200e3b 100644 --- a/src/main/java/org/springframework/data/redis/serializer/JdkSerializationRedisSerializer.java +++ b/src/main/java/org/springframework/data/redis/serializer/JdkSerializationRedisSerializer.java @@ -77,8 +77,8 @@ public class JdkSerializationRedisSerializer implements RedisSerializer public JdkSerializationRedisSerializer(Converter serializer, Converter deserializer) { - this.serializer = RedisAssertions.requireObject(serializer, "Serializer must not be null"); - this.deserializer = RedisAssertions.requireObject(deserializer, "Deserializer must not be null"); + this.serializer = RedisAssertions.requireNonNull(serializer, "Serializer must not be null"); + this.deserializer = RedisAssertions.requireNonNull(deserializer, "Deserializer must not be null"); } @Override diff --git a/src/main/java/org/springframework/data/redis/util/RedisAssertions.java b/src/main/java/org/springframework/data/redis/util/RedisAssertions.java index 1e26b5936..2fed009c8 100644 --- a/src/main/java/org/springframework/data/redis/util/RedisAssertions.java +++ b/src/main/java/org/springframework/data/redis/util/RedisAssertions.java @@ -37,10 +37,10 @@ public abstract class RedisAssertions { * @param arguments array of {@link Object} arguments used to format the {@link String message}. * @return the given {@link Object}. * @throws IllegalArgumentException if the {@link Object target} is {@literal null}. - * @see #requireObject(Object, Supplier) + * @see #requireNonNull(Object, Supplier) */ - public static T requireObject(@Nullable T target, String message, Object... arguments) { - return requireObject(target, () -> String.format(message, arguments)); + public static T requireNonNull(@Nullable T target, String message, Object... arguments) { + return requireNonNull(target, () -> String.format(message, arguments)); } /** @@ -52,7 +52,7 @@ public abstract class RedisAssertions { * @return the given {@link Object}. * @throws IllegalArgumentException if the {@link Object target} is {@literal null}. */ - public static T requireObject(@Nullable T target, Supplier message) { + public static T requireNonNull(@Nullable T target, Supplier message) { Assert.notNull(target, message); return target; } @@ -66,7 +66,7 @@ public abstract class RedisAssertions { * @param arguments array of {@link Object} arguments used to format the {@link String message}. * @return the given {@link Object}. * @throws IllegalArgumentException if the {@link Object target} is {@literal null}. - * @see #requireObject(Object, Supplier) + * @see #requireNonNull(Object, Supplier) */ public static T requireState(@Nullable T target, String message, Object... arguments) { return requireState(target, () -> String.format(message, arguments)); diff --git a/src/test/java/org/springframework/data/redis/util/RedisAssertionsUnitTests.java b/src/test/java/org/springframework/data/redis/util/RedisAssertionsUnitTests.java index e8e3a9951..ea157930f 100644 --- a/src/test/java/org/springframework/data/redis/util/RedisAssertionsUnitTests.java +++ b/src/test/java/org/springframework/data/redis/util/RedisAssertionsUnitTests.java @@ -32,7 +32,7 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; /** - * Unit tests for {@link RedisAssertions}. + * Unit Tests for {@link RedisAssertions}. * * @author John Blum */ @@ -43,34 +43,34 @@ class RedisAssertionsUnitTests { private Supplier mockSupplier; @Test - void requireObjectWithMessageAndArgumentsIsSuccessful() { - assertThat(RedisAssertions.requireObject("test", "Test message")).isEqualTo("test"); + void requireNonNullWithMessageAndArgumentsIsSuccessful() { + assertThat(RedisAssertions.requireNonNull("test", "Test message")).isEqualTo("test"); } @Test - void requireObjectWithMessageAndArgumentsThrowsIllegalArgumentException() { + void requireNonNullWithMessageAndArgumentsThrowsIllegalArgumentException() { assertThatIllegalArgumentException() - .isThrownBy(() -> RedisAssertions.requireObject(null, "This is a %s", "test")) + .isThrownBy(() -> RedisAssertions.requireNonNull(null, "This is a %s", "test")) .withMessage("This is a test") .withNoCause(); } @Test - void requireObjectWithSupplierIsSuccessful() { + void requireNonNullWithSupplierIsSuccessful() { - assertThat(RedisAssertions.requireObject("mock", this.mockSupplier)).isEqualTo("mock"); + assertThat(RedisAssertions.requireNonNull("mock", this.mockSupplier)).isEqualTo("mock"); verifyNoInteractions(this.mockSupplier); } @Test - void requireObjectWithSupplierThrowsIllegalArgumentException() { + void requireNonNullWithSupplierThrowsIllegalArgumentException() { doReturn("Mock message").when(this.mockSupplier).get(); assertThatIllegalArgumentException() - .isThrownBy(() -> RedisAssertions.requireObject(null, this.mockSupplier)) + .isThrownBy(() -> RedisAssertions.requireNonNull(null, this.mockSupplier)) .withMessage("Mock message") .withNoCause();