Remove DurationUtil utility class

Rename setReceiveTimeout for duration overload to setReceiveDuration

Author: cppwfs

spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisQueueInboundGateway.java

@@ -17,9 +17,7 @@
 package org.springframework.integration.redis.inbound;
 
 import java.time.Duration;
-import java.util.Objects;
 import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
 
 import org.jspecify.annotations.Nullable;
 
@@ -36,7 +34,6 @@
 import org.springframework.integration.channel.MessagePublishingErrorHandler;
 import org.springframework.integration.gateway.MessagingGatewaySupport;
 import org.springframework.integration.redis.event.RedisExceptionEvent;
-import org.springframework.integration.redis.util.DurationUtil;
 import org.springframework.integration.support.management.IntegrationManagedResource;
 import org.springframework.integration.util.ErrorHandlingTaskExecutor;
 import org.springframework.jmx.export.annotation.ManagedMetric;
@@ -142,7 +139,7 @@ public void setSerializer(RedisSerializer<?> serializer) {
 	 * @param receiveTimeout {@link Duration} containing the receive timeout.
 	 * @since 7.1
 	 */
-	public void setReceiveTimeout(Duration receiveTimeout) {
+	public void setReceiveDuration(Duration receiveTimeout) {
 		Assert.isTrue(!receiveTimeout.isNegative(), "'receiveTimeout' must be >= 0.");
 		this.receiveTimeout = receiveTimeout;
 	}
@@ -162,27 +159,7 @@ public void setReceiveTimeout(Duration receiveTimeout) {
 	 * @param receiveTimeout Must be non-negative. Specified in milliseconds.
 	 */
 	public void setReceiveTimeout(long receiveTimeout) {
-		setReceiveTimeout(Duration.ofMillis(receiveTimeout));
-	}
-
-	/**
-	 * This timeout is used when retrieving elements from the queue
-	 * specified by {@link #boundListOperations}.
-	 * <p>
-	 * If the queue does contain elements, the data is retrieved immediately. However,
-	 * if the queue is empty, the Redis connection is blocked until either an element
-	 * can be retrieved from the queue or until the specified timeout passes.
-	 * <p>
-	 * A timeout of zero can be used to block indefinitely. If not set explicitly
-	 * the timeout value will default to {@code 1000 millis}
-	 * <p>
-	 * See also: https://redis.io/commands/brpop
-	 * @param receiveTimeout String containing the receive timeout as a string serialized (millis) or
-	 * ISO-8601 duration format.
-	 * @since 7.1
-	 */
-	public void setReceiveTimeout(String receiveTimeout) {
-		setReceiveTimeout(DurationUtil.toDuration(Objects.requireNonNull(receiveTimeout), TimeUnit.MILLISECONDS));
+		setReceiveDuration(Duration.ofMillis(receiveTimeout));
 	}
 
 	public void setTaskExecutor(Executor taskExecutor) {

spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisQueueMessageDrivenEndpoint.java

@@ -17,10 +17,8 @@
 package org.springframework.integration.redis.inbound;
 
 import java.time.Duration;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.Executor;
-import java.util.concurrent.TimeUnit;
 
 import org.jspecify.annotations.Nullable;
 
@@ -38,7 +36,6 @@
 import org.springframework.integration.channel.MessagePublishingErrorHandler;
 import org.springframework.integration.endpoint.MessageProducerSupport;
 import org.springframework.integration.redis.event.RedisExceptionEvent;
-import org.springframework.integration.redis.util.DurationUtil;
 import org.springframework.integration.support.channel.ChannelResolverUtils;
 import org.springframework.integration.support.management.IntegrationManagedResource;
 import org.springframework.integration.util.ErrorHandlingTaskExecutor;
@@ -99,7 +96,6 @@ public class RedisQueueMessageDrivenEndpoint extends MessageProducerSupport
 	 * @param connectionFactory Must not be null
 	 */
 	public RedisQueueMessageDrivenEndpoint(String queueName, RedisConnectionFactory connectionFactory) {
-
 		Assert.hasText(queueName, "'queueName' is required");
 		Assert.notNull(connectionFactory, "'connectionFactory' must not be null");
 		RedisTemplate<String, byte[]> template = new RedisTemplate<>();
@@ -154,31 +150,11 @@ public void setExpectMessage(boolean expectMessage) {
 	 * @param receiveTimeout {@link Duration} containing the receive timeout.
 	 * @since 7.1
 	 */
-	public void setReceiveTimeout(Duration receiveTimeout) {
+	public void setReceiveDuration(Duration receiveTimeout) {
 		Assert.isTrue(!receiveTimeout.isNegative(), "'receiveTimeout' must be >= 0.");
 		this.receiveTimeout = receiveTimeout;
 	}
 
-	/**
-	 * This timeout is used when retrieving elements from the queue
-	 * specified by {@link BoundListOperations}.
-	 * <p>
-	 * If the queue does contain elements, the data is retrieved immediately. However,
-	 * if the queue is empty, the Redis connection is blocked until either an element
-	 * can be retrieved from the queue or until the specified timeout passes.
-	 * <p>
-	 * A timeout of zero can be used to block indefinitely. If not set explicitly
-	 * the timeout value will default to {@code 1000 millis}
-	 * <p>
-	 * See also: https://redis.io/commands/brpop
-	 * @param receiveTimeout String containing the receive timeout as a string serialized (millis) or
-	 * ISO-8601 duration format.
-	 * @since 7.1
-	 */
-	public void setReceiveTimeout(String receiveTimeout) {
-		setReceiveTimeout(DurationUtil.toDuration(Objects.requireNonNull(receiveTimeout), TimeUnit.MILLISECONDS));
-	}
-
 	/**
 	 * This timeout (milliseconds) is used when retrieving elements from the queue
 	 * specified by {@link #boundListOperations}.
@@ -194,7 +170,7 @@ public void setReceiveTimeout(String receiveTimeout) {
 	 * @param receiveTimeout Must be non-negative. Specified in milliseconds.
 	 */
 	public void setReceiveTimeout(long receiveTimeout) {
-		setReceiveTimeout(Duration.ofMillis(receiveTimeout));
+		setReceiveDuration(Duration.ofMillis(receiveTimeout));
 	}
 
 	public void setTaskExecutor(Executor taskExecutor) {

spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisQueueOutboundGateway.java

@@ -17,8 +17,6 @@
 package org.springframework.integration.redis.outbound;
 
 import java.time.Duration;
-import java.util.Objects;
-import java.util.concurrent.TimeUnit;
 
 import org.jspecify.annotations.Nullable;
 
@@ -29,7 +27,6 @@
 import org.springframework.data.redis.serializer.RedisSerializer;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 import org.springframework.integration.handler.AbstractReplyProducingMessageHandler;
-import org.springframework.integration.redis.util.DurationUtil;
 import org.springframework.messaging.Message;
 import org.springframework.util.AlternativeJdkIdGenerator;
 import org.springframework.util.Assert;
@@ -100,31 +97,11 @@ public void setBeanClassLoader(ClassLoader beanClassLoader) {
 	 * @param receiveTimeout {@link Duration} containing the receive timeout.
 	 * @since 7.1
 	 */
-	public void setReceiveTimeout(Duration receiveTimeout) {
+	public void setReceiveDuration(Duration receiveTimeout) {
 		Assert.isTrue(!receiveTimeout.isNegative(), "'receiveTimeout' must be >= 0.");
 		this.receiveTimeout = receiveTimeout;
 	}
 
-	/**
-	 * This timeout is used when retrieving elements from the queue
-	 * specified by {@link BoundListOperations}.
-	 * <p>
-	 * If the queue does contain elements, the data is retrieved immediately. However,
-	 * if the queue is empty, the Redis connection is blocked until either an element
-	 * can be retrieved from the queue or until the specified timeout passes.
-	 * <p>
-	 * A timeout of zero can be used to block indefinitely. If not set explicitly
-	 * the timeout value will default to {@code 1000 millis}
-	 * <p>
-	 * See also: https://redis.io/commands/brpop
-	 * @param receiveTimeout String containing the receive timeout as a string serialized (millis) or
-	 * ISO-8601 duration format.
-	 * @since 7.1
-	 */
-	public void setReceiveTimeout(String receiveTimeout) {
-		setReceiveTimeout(DurationUtil.toDuration(Objects.requireNonNull(receiveTimeout), TimeUnit.MILLISECONDS));
-	}
-
 	/**
 	 * This timeout is used when retrieving elements from the queue
 	 * specified by {@link BoundListOperations}.
@@ -142,7 +119,7 @@ public void setReceiveTimeout(String receiveTimeout) {
 	 */
 	@Deprecated(forRemoval = true, since = "7.1")
 	public void setReceiveTimeout(int receiveTimeout) {
-		setReceiveTimeout(Duration.ofMillis(receiveTimeout));
+		setReceiveDuration(Duration.ofMillis(receiveTimeout));
 	}
 
 	/**
@@ -160,7 +137,7 @@ public void setReceiveTimeout(int receiveTimeout) {
 	 * @param receiveTimeout Must be non-negative. Specified in milliseconds.
 	 */
 	public void setReceiveTimeout(long receiveTimeout) {
-		setReceiveTimeout(Duration.ofMillis(receiveTimeout));
+		setReceiveDuration(Duration.ofMillis(receiveTimeout));
 	}
 
 	public void setExtractPayload(boolean extractPayload) {

spring-integration-redis/src/main/java/org/springframework/integration/redis/util/DurationUtil.java

@@ -104,7 +104,7 @@ void testInboundGatewayStop() {
 			assertThat(e.getMessage()).contains("No reply produced");
 		}
 		finally {
-			this.outboundGateway.setReceiveTimeout(receiveTimeout);
+			this.outboundGateway.setReceiveDuration(receiveTimeout);
 		}
 	}
 
@@ -121,7 +121,7 @@ void testNullSerializer() {
 		}
 		finally {
 			this.inboundGateway.setSerializer(new StringRedisSerializer());
-			this.outboundGateway.setReceiveTimeout(receiveTimeout);
+			this.outboundGateway.setReceiveDuration(receiveTimeout);
 		}
 	}