This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 08686a2497c18c8008182d97a434bd17dfd9ebd9 Author: Benoit Tellier <[email protected]> AuthorDate: Fri Jan 28 11:58:46 2022 +0700 JAMES-3683 Tiny scala code style enhancement --- .../org/apache/james/rate/limiter/redis/RedisRateLimiter.scala | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/server/mailet/rate-limiter-redis/src/main/scala/org/apache/james/rate/limiter/redis/RedisRateLimiter.scala b/server/mailet/rate-limiter-redis/src/main/scala/org/apache/james/rate/limiter/redis/RedisRateLimiter.scala index 698d275..e30a810 100644 --- a/server/mailet/rate-limiter-redis/src/main/scala/org/apache/james/rate/limiter/redis/RedisRateLimiter.scala +++ b/server/mailet/rate-limiter-redis/src/main/scala/org/apache/james/rate/limiter/redis/RedisRateLimiter.scala @@ -50,13 +50,11 @@ class RedisRateLimiterFactory(redisConfiguration: RedisRateLimiterConfiguration) new RedisSingleInstanceRateLimitjFactory(RedisClient.create(redisConfiguration.redisURI.value.last)) } - override def withSpecification(rules: Rules): RateLimiter = { - val requestRateLimiter: ReactiveRequestRateLimiter = rateLimitjFactory.getInstanceReactive(rules.rules + override def withSpecification(rules: Rules): RateLimiter = + RedisRateLimiter(rateLimitjFactory.getInstanceReactive(rules.rules .map(convert) .map(withPrecision) - .toSet.asJava) - RedisRateLimiter(requestRateLimiter) - } + .toSet.asJava)) private def withPrecision(rule: RequestLimitRule): RequestLimitRule = redisConfiguration.windowPrecision @@ -64,7 +62,6 @@ class RedisRateLimiterFactory(redisConfiguration: RedisRateLimiterConfiguration) .getOrElse(rule) private def convert(rule: Rule): RequestLimitRule = RequestLimitRule.of(rule.duration, rule.quantity.value) - } case class RedisRateLimiter(limiter: ReactiveRequestRateLimiter) extends RateLimiter { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
