Rename RedisAssertions.requiredObject(..) to requireNonNull(..).

Closes #2621

Author: jxblum

src/main/java/org/springframework/data/redis/cache/RedisCacheManager.java

@@ -178,10 +178,10 @@ public RedisCacheManager(RedisCacheWriter cacheWriter, RedisCacheConfiguration d
 	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 static class RedisCacheManagerBuilder {
 		 * @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 static RedisCacheManagerBuilder fromCacheWriter(RedisCacheWriter cacheWri
 		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 RedisCacheConfiguration cacheDefaults() {
 		 */
 		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 RedisCacheManagerBuilder cacheDefaults(RedisCacheConfiguration defaultCac
 		 * @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 RedisCacheManagerBuilder enableStatistics() {
 		 */
 		public RedisCacheManagerBuilder initialCacheNames(Set<String> 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 RedisCacheManagerBuilder withCacheConfiguration(String cacheName,
 		public RedisCacheManagerBuilder withInitialCacheConfigurations(
 				Map<String, RedisCacheConfiguration> 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);

src/main/java/org/springframework/data/redis/connection/RedisClusterNode.java

@@ -76,7 +76,7 @@ public RedisClusterNode(String id) {
 
 		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 RedisClusterNode(String id) {
 	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 RedisClusterNode(String host, int port, SlotRange slotRange) {
 		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");
 	}
 
 	/**

src/main/java/org/springframework/data/redis/serializer/GenericJackson2JsonRedisSerializer.java

@@ -180,9 +180,9 @@ public GenericJackson2JsonRedisSerializer(ObjectMapper mapper, JacksonObjectRead
 	private GenericJackson2JsonRedisSerializer(ObjectMapper mapper, JacksonObjectReader reader,
 			JacksonObjectWriter writer, @Nullable String typeHintPropertyName) {
 
-		this.mapper = RedisAssertions.requireObject(mapper, "ObjectMapper must not be null");
-		this.reader = RedisAssertions.requireObject(reader, "Reader must not be null");
-		this.writer = RedisAssertions.requireObject(writer, "Writer must not be null");
+		this.mapper = RedisAssertions.requireNonNull(mapper, "ObjectMapper must not be null");
+		this.reader = RedisAssertions.requireNonNull(reader, "Reader must not be null");
+		this.writer = RedisAssertions.requireNonNull(writer, "Writer must not be null");
 
 		this.defaultTypingEnabled = Lazy.of(() -> mapper.getSerializationConfig()
 				.getDefaultTyper(null) != null);

src/main/java/org/springframework/data/redis/serializer/JdkSerializationRedisSerializer.java

@@ -77,8 +77,8 @@ public JdkSerializationRedisSerializer(@Nullable ClassLoader classLoader) {
 	public JdkSerializationRedisSerializer(Converter<Object, byte[]> serializer,
 			Converter<byte[], Object> 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

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> T requireObject(@Nullable T target, String message, Object... arguments) {
-		return requireObject(target, () -> String.format(message, arguments));
+	public static <T> T requireNonNull(@Nullable T target, String message, Object... arguments) {
+		return requireNonNull(target, () -> String.format(message, arguments));
 	}
 
 	/**
@@ -52,7 +52,7 @@ public static <T> T requireObject(@Nullable T target, String message, Object...
 	 * @return the given {@link Object}.
 	 * @throws IllegalArgumentException if the {@link Object target} is {@literal null}.
 	 */
-	public static <T> T requireObject(@Nullable T target, Supplier<String> message) {
+	public static <T> T requireNonNull(@Nullable T target, Supplier<String> message) {
 		Assert.notNull(target, message);
 		return target;
 	}
@@ -66,7 +66,7 @@ public static <T> T requireObject(@Nullable T target, Supplier<String> message)
 	 * @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> T requireState(@Nullable T target, String message, Object... arguments) {
 		return requireState(target, () -> String.format(message, arguments));

src/test/java/org/springframework/data/redis/util/RedisAssertionsUnitTests.java

@@ -32,7 +32,7 @@
 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<String> 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();