This is an automated email from the ASF dual-hosted git repository. hqtran pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit aa4b2a991417e0ae18e000c287cfa78c7c80afec Author: Quan Tran <[email protected]> AuthorDate: Mon Jun 2 13:53:46 2025 +0700 JAMES-3693 Remove unused timeout argument - it is not used anywhere - timeout can be put as part of Redis URL. --- .../apache/james/backends/redis/RedisClientFactory.scala | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/backends-common/redis/src/main/java/org/apache/james/backends/redis/RedisClientFactory.scala b/backends-common/redis/src/main/java/org/apache/james/backends/redis/RedisClientFactory.scala index 8e9e4a213c..054de42d1f 100644 --- a/backends-common/redis/src/main/java/org/apache/james/backends/redis/RedisClientFactory.scala +++ b/backends-common/redis/src/main/java/org/apache/james/backends/redis/RedisClientFactory.scala @@ -19,8 +19,6 @@ package org.apache.james.backends.redis -import java.time.Duration - import io.lettuce.core.cluster.{ClusterClientOptions, RedisClusterClient} import io.lettuce.core.resource.{ClientResources, ThreadFactoryProvider} import io.lettuce.core.{AbstractRedisClient, ClientOptions, RedisClient, SslOptions, TimeoutOptions} @@ -44,8 +42,7 @@ class RedisClientFactory @Singleton() @Inject() case sentinelRedisConfiguration: SentinelRedisConfiguration => createSentinelClient(sentinelRedisConfiguration) } - private def createStandaloneClient(standaloneRedisConfiguration: StandaloneRedisConfiguration, maybeTimeout: Option[Duration] = None): RedisClient = { - maybeTimeout.foreach(timeout => standaloneRedisConfiguration.redisURI.setTimeout(timeout)) + private def createStandaloneClient(standaloneRedisConfiguration: StandaloneRedisConfiguration): RedisClient = { val resourceBuilder: ClientResources.Builder = ClientResources.builder() .threadFactoryProvider(threadFactoryProvider) standaloneRedisConfiguration.ioThreads.foreach(value => resourceBuilder.ioThreadPoolSize(value)) @@ -55,17 +52,13 @@ class RedisClientFactory @Singleton() @Inject() redisClient } - private def createClusterClient(clusterRedisConfiguration: ClusterRedisConfiguration, maybeTimeout: Option[Duration] = None): RedisClusterClient = { + private def createClusterClient(clusterRedisConfiguration: ClusterRedisConfiguration): RedisClusterClient = { val resourceBuilder: ClientResources.Builder = ClientResources.builder() .threadFactoryProvider(threadFactoryProvider) clusterRedisConfiguration.ioThreads.foreach(value => resourceBuilder.ioThreadPoolSize(value)) clusterRedisConfiguration.workerThreads.foreach(value => resourceBuilder.computationThreadPoolSize(value)) val redisClient = RedisClusterClient.create(resourceBuilder.build(), - clusterRedisConfiguration.redisURI.value - .map(rURI => { - maybeTimeout.foreach(timeout => rURI.setTimeout(timeout)) - rURI - }).asJava) + clusterRedisConfiguration.redisURI.value.asJava) redisClient.setOptions(ClusterClientOptions.builder( createClientOptions(clusterRedisConfiguration.useSSL, clusterRedisConfiguration.mayBeSSLConfiguration)) .build()) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
