This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/rocketmq-spring.git
The following commit(s) were added to refs/heads/master by this push:
new 251a53e [ISSUE #610] fix setRequestTimeout use Duration.ofDays (#621)
251a53e is described below
commit 251a53eec91dffef94c20d25c6876fc3e3973366
Author: panzhi <panzh...@qq.com>
AuthorDate: Fri Feb 9 10:42:07 2024 +0800
[ISSUE #610] fix setRequestTimeout use Duration.ofDays (#621)
Co-authored-by: rongtong <jinrongto...@163.com>
---
.../rocketmq/client/autoconfigure/ExtConsumerResetConfiguration.java | 2 +-
.../rocketmq/client/autoconfigure/ExtTemplateResetConfiguration.java | 2 +-
.../rocketmq/client/autoconfigure/ListenerContainerConfiguration.java | 2 +-
.../main/java/org/apache/rocketmq/client/support/RocketMQUtil.java | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtConsumerResetConfiguration.java
b/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtConsumerResetConfiguration.java
index 8a758b5..23b70af 100644
---
a/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtConsumerResetConfiguration.java
+++
b/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtConsumerResetConfiguration.java
@@ -115,7 +115,7 @@ public class ExtConsumerResetConfiguration implements
ApplicationContextAware, S
String endPoints = resolvePlaceholders(annotation.endpoints(),
simpleConsumer.getEndpoints());
String tag = resolvePlaceholders(annotation.tag(),
simpleConsumer.getTag());
String filterExpressionType =
resolvePlaceholders(annotation.filterExpressionType(),
simpleConsumer.getFilterExpressionType());
- Duration requestTimeout = Duration.ofDays(annotation.requestTimeout());
+ Duration requestTimeout =
Duration.ofSeconds(annotation.requestTimeout());
int awaitDuration = annotation.awaitDuration();
Boolean sslEnabled = simpleConsumer.isSslEnabled();
Assert.hasText(topicName, "[topic] must not be null");
diff --git
a/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtTemplateResetConfiguration.java
b/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtTemplateResetConfiguration.java
index bd301c7..11ddf85 100644
---
a/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtTemplateResetConfiguration.java
+++
b/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ExtTemplateResetConfiguration.java
@@ -112,7 +112,7 @@ public class ExtTemplateResetConfiguration implements
ApplicationContextAware, S
secretKey = StringUtils.hasLength(secretKey) ? secretKey :
producerConfig.getSecretKey();
int requestTimeout = annotation.requestTimeout();
Boolean sslEnabled = producerConfig.isSslEnabled();
- ClientConfiguration clientConfiguration =
RocketMQUtil.createClientConfiguration(accessKey, secretKey, endpoints,
Duration.ofDays(requestTimeout), sslEnabled);
+ ClientConfiguration clientConfiguration =
RocketMQUtil.createClientConfiguration(accessKey, secretKey, endpoints,
Duration.ofSeconds(requestTimeout), sslEnabled);
final ClientServiceProvider provider =
ClientServiceProvider.loadService();
ProducerBuilder producerBuilder = provider.newProducerBuilder()
.setClientConfiguration(clientConfiguration).setMaxAttempts(annotation.maxAttempts())
diff --git
a/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ListenerContainerConfiguration.java
b/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ListenerContainerConfiguration.java
index a6f4640..81c5b09 100644
---
a/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ListenerContainerConfiguration.java
+++
b/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/autoconfigure/ListenerContainerConfiguration.java
@@ -90,7 +90,7 @@ public class ListenerContainerConfiguration implements
ApplicationContextAware {
container.setTag(environment.resolvePlaceholders(annotation.tag()));
container.setEndpoints(environment.resolvePlaceholders(annotation.endpoints()));
container.setTopic(environment.resolvePlaceholders(annotation.topic()));
-
container.setRequestTimeout(Duration.ofDays(annotation.requestTimeout()));
+
container.setRequestTimeout(Duration.ofSeconds(annotation.requestTimeout()));
container.setMaxCachedMessageCount(annotation.maxCachedMessageCount());
container.setConsumptionThreadCount(annotation.consumptionThreadCount());
container.setMaxCacheMessageSizeInBytes(annotation.maxCacheMessageSizeInBytes());
diff --git
a/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/support/RocketMQUtil.java
b/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/support/RocketMQUtil.java
index fab2d46..9104828 100644
---
a/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/support/RocketMQUtil.java
+++
b/rocketmq-v5-client-spring-boot/src/main/java/org/apache/rocketmq/client/support/RocketMQUtil.java
@@ -120,7 +120,7 @@ public class RocketMQUtil {
String accessKey = rocketMQProducer.getAccessKey();
String secretKey = rocketMQProducer.getSecretKey();
String endPoints = rocketMQProducer.getEndpoints();
- Duration requestTimeout =
Duration.ofDays(rocketMQProducer.getRequestTimeout());
+ Duration requestTimeout =
Duration.ofSeconds(rocketMQProducer.getRequestTimeout());
boolean sslEnabled = rocketMQProducer.isSslEnabled();
return createClientConfiguration(accessKey, secretKey, endPoints,
requestTimeout, sslEnabled);
}
@@ -129,7 +129,7 @@ public class RocketMQUtil {
String accessKey = simpleConsumer.getAccessKey();
String secretKey = simpleConsumer.getSecretKey();
String endPoints = simpleConsumer.getEndpoints();
- Duration requestTimeout =
Duration.ofDays(simpleConsumer.getRequestTimeout());
+ Duration requestTimeout =
Duration.ofSeconds(simpleConsumer.getRequestTimeout());
boolean sslEnabled = simpleConsumer.isSslEnabled();
return createClientConfiguration(accessKey, secretKey, endPoints,
requestTimeout, sslEnabled);
