diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/FixedRateLimiter.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/FixedRateLimiter.java
deleted file mode 100644
index 32d11f5ce..000000000
--- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/FixedRateLimiter.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2024 Hutool Team.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.dromara.hutool.core.thread.ratelimiter;
-
-import org.dromara.hutool.core.thread.NamedThreadFactory;
-
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.ThreadFactory;
-
-/**
- * 基于{@link Semaphore} 实现的限流器
- * 此算法实现了：固定窗口(Fixed Window)计数法，即设置固定窗口
- * 窗口时间为{@link RateLimiterConfig#getRefreshPeriod()}，每次窗口内请求数不超过{@link RateLimiterConfig#getCapacity()}
- * 在窗口期允许的请求数是固定的，请求结束后拒绝访问，直到下一个窗口开始则重新开始计数。
- * 参考：https://github.com/TFdream/juice/blob/master/juice-ratelimiter/src/main/java/juice/ratelimiter/internal/SemaphoreBasedRateLimiter.java
- *
- *
- * - 优点：内存占用小，实现简单
- * - 缺点：不够平滑，在窗口期开始时可能请求暴增，窗口结束时大量请求丢失，即“突刺现象”。
- *
- *
- * @author Ricky Fung
- * @author Looly
- * @since 6.0.0
- */
-public class FixedRateLimiter extends SemaphoreRateLimiter {
-
- /**
- * 构造
- *
- * @param config 配置
- */
- public FixedRateLimiter(final RateLimiterConfig config) {
- super(config, null, configureScheduler());
- }
-
- /**
- * 刷新限制，填满许可数为{@link RateLimiterConfig#getCapacity()}
- * 用户可手动调用此方法填满许可
- *
- * @see RateLimiterConfig#getCapacity()
- */
- @Override
- public void refreshLimit() {
- final int permitsToFill = this.config.getCapacity() - semaphore.availablePermits();
- if (permitsToFill > 0) {
- // 只有在周期内不满时，才填充
- semaphore.release(permitsToFill);
- }
- }
-
- /**
- * 创建定时器
- *
- * @return 定时器
- */
- private static ScheduledExecutorService configureScheduler() {
- final ThreadFactory threadFactory = new NamedThreadFactory("FixedRateLimiterScheduler-", true);
- return new ScheduledThreadPoolExecutor(1, threadFactory);
- }
-}
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/RateLimiterConfig.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/RateLimiterConfig.java
index cb3e6ea3a..bbf626d8b 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/RateLimiterConfig.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/RateLimiterConfig.java
@@ -29,59 +29,69 @@ public class RateLimiterConfig {
/**
* 创建限流配置
*
- * @param timeout 超时时间，即超过这个时间没有获取到许可，则返回false
- * @param limitRefreshPeriod 限制刷新周期，即每多少时间刷新一次
- * @param limitForPeriod 个周期的许可数
* @return RateLimiterConfig
*/
- public static RateLimiterConfig of(final Duration timeout, final Duration limitRefreshPeriod, final int limitForPeriod) {
- return new RateLimiterConfig(timeout, limitRefreshPeriod, limitForPeriod);
+ public static RateLimiterConfig of() {
+ return new RateLimiterConfig();
}
/**
* 超时时间，即超过这个时间没有获取到许可，则返回false
*/
- private final Duration timeout;
+ private Duration timeout;
/**
* 限制刷新周期，即每多少时间刷新一次
*/
- private final Duration refreshPeriod;
+ private Duration refreshPeriod;
/**
* 容量，可以是总容量，或者每个周期的容量
*/
- private final int capacity;
-
+ private int capacity;
/**
- * 构造
- *
- * @param timeout 超时时间，即超过这个时间没有获取到许可，则返回false
- * @param refreshPeriod 刷新周期，即每多少时间刷新一次
- * @param capacity 容量
+ * 在刷新周期内释放的最大数量，不能超过{@link #capacity}
*/
- public RateLimiterConfig(final Duration timeout, final Duration refreshPeriod, final int capacity) {
- this.timeout = timeout;
- this.refreshPeriod = refreshPeriod;
- this.capacity = capacity;
- }
+ private int maxReleaseCount;
/**
- * 超时时间，即超过这个时间没有获取到许可，则返回false，单位毫秒
+ * 超时时间，即超过这个时间没有获取到许可，则返回false
*
- * @return 超时时间，单位毫秒
+ * @return 超时时间
*/
public Duration getTimeout() {
return timeout;
}
/**
- * 刷新周期，即每多少时间刷新一次，单位毫秒
+ * 设置超时时间，即超过这个时间没有获取到许可，则返回false
*
- * @return 刷新周期，单位毫秒
+ * @param timeout 超时时间
+ * @return this
+ */
+ public RateLimiterConfig setTimeout(final Duration timeout) {
+ this.timeout = timeout;
+ return this;
+ }
+
+ /**
+ * 刷新周期，即每多少时间刷新一次
+ *
+ * @return 刷新周期
*/
public Duration getRefreshPeriod() {
return refreshPeriod;
}
+ /**
+ * 设置刷新周期，即每多少时间刷新一次，单位毫秒
+ *
+ * @param refreshPeriod 刷新周期
+ * @return this
+ */
+ public RateLimiterConfig setRefreshPeriod(final Duration refreshPeriod) {
+ this.refreshPeriod = refreshPeriod;
+ return this;
+ }
+
/**
* 容量，可以是总容量，或者每个周期的容量
*
@@ -90,4 +100,34 @@ public class RateLimiterConfig {
public int getCapacity() {
return capacity;
}
+
+ /**
+ * 设置容量，可以是总容量，或者每个周期的容量
+ * @param capacity 容量
+ * @return this
+ */
+ public RateLimiterConfig setCapacity(final int capacity) {
+ this.capacity = capacity;
+ return this;
+ }
+
+ /**
+ * 在刷新周期内释放的最大数量，不能超过{@link #capacity}
+ *
+ * @return 在刷新周期内释放的最大数量
+ */
+ public int getMaxReleaseCount() {
+ return maxReleaseCount;
+ }
+
+ /**
+ * 设置在刷新周期内释放的最大数量，不能超过{@link #capacity}
+ *
+ * @param maxReleaseCount 在刷新周期内释放的最大数量
+ * @return this
+ */
+ public RateLimiterConfig setMaxReleaseCount(final int maxReleaseCount) {
+ this.maxReleaseCount = maxReleaseCount;
+ return this;
+ }
}
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/SemaphoreRateLimiter.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/SemaphoreRateLimiter.java
index 0b01cf4ff..52e69c526 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/SemaphoreRateLimiter.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/SemaphoreRateLimiter.java
@@ -19,9 +19,7 @@ package org.dromara.hutool.core.thread.ratelimiter;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.lang.Opt;
-import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
/**
* 基于{@link Semaphore} 实现的限流器
@@ -34,7 +32,6 @@ public abstract class SemaphoreRateLimiter implements RateLimiter {
protected final RateLimiterConfig config;
protected final Semaphore semaphore;
- protected final ScheduledExecutorService scheduler;
// region ----- Constructor
/**
@@ -50,25 +47,11 @@ public abstract class SemaphoreRateLimiter implements RateLimiter {
* 构造
*
* @param config 限流配置
- * @param semaphore {@link Semaphore}
+ * @param semaphore {@link Semaphore}，默认使用{@link RateLimiterConfig#getCapacity()}创建
*/
public SemaphoreRateLimiter(final RateLimiterConfig config, final Semaphore semaphore) {
- this(config, semaphore, null);
- }
-
- /**
- * 构造
- *
- * @param config 限流配置
- * @param semaphore {@link Semaphore}，默认使用{@link RateLimiterConfig#getCapacity()}创建
- * @param scheduler 定时器，{@code null}表示不定时
- */
- public SemaphoreRateLimiter(final RateLimiterConfig config, final Semaphore semaphore, final ScheduledExecutorService scheduler) {
this.config = Assert.notNull(config);
this.semaphore = Opt.ofNullable(semaphore).orElseGet(() -> new Semaphore(config.getCapacity()));
- this.scheduler = scheduler;
- //启动定时器
- scheduleLimitRefresh();
}
// endregion
@@ -94,20 +77,4 @@ public abstract class SemaphoreRateLimiter implements RateLimiter {
* @see RateLimiterConfig#getCapacity()
*/
public abstract void refreshLimit();
-
- /**
- * 启动定时器，未定义则不启动
- */
- private void scheduleLimitRefresh() {
- if (null == this.scheduler) {
- return;
- }
- final long limitRefreshPeriod = this.config.getRefreshPeriod().toNanos();
- scheduler.scheduleAtFixedRate(
- this::refreshLimit,
- limitRefreshPeriod,
- limitRefreshPeriod,
- TimeUnit.NANOSECONDS
- );
- }
}
diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/TokenBucketRateLimiter.java b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/TokenBucketRateLimiter.java
index b66629ff2..a7a584c67 100644
--- a/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/TokenBucketRateLimiter.java
+++ b/hutool-core/src/main/java/org/dromara/hutool/core/thread/ratelimiter/TokenBucketRateLimiter.java
@@ -18,20 +18,31 @@ package org.dromara.hutool.core.thread.ratelimiter;
import org.dromara.hutool.core.thread.NamedThreadFactory;
+import java.io.Closeable;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.TimeUnit;
/**
* 令牌桶（Token Bucket）限流器
- * 令牌桶算法能够在限制数据的平均传输速率的同时还允许某种程度的突发传输
- * 概念见：https://zhuanlan.zhihu.com/p/110596981
- * 此限流器通过{@link #refreshLimit()}方法配合{@link RateLimiterConfig#getRefreshPeriod()} 实现按照固定速率填充令牌到桶中。
+ * 令牌桶算法能够在限制数据的平均传输速率的同时还允许某种程度的突发传输，概念见：https://zhuanlan.zhihu.com/p/110596981
+ *
+ *
+ * 令牌发放：通过scheduler定时器，定时向令牌桶中添加令牌，直到令牌桶满。
+ * 令牌发放周期为{@link RateLimiterConfig#getRefreshPeriod()}，周期内发放个数为{@link RateLimiterConfig#getMaxReleaseCount()}
+ *
+ *
+ *
+ * 令牌请求：通过{@link #tryAcquire(int)} 方法请求令牌，如果令牌桶中数量不足，则返回false，表示请求失败。
+ *
*
* @author looly
* @since 6.0.0
*/
-public class TokenBucketRateLimiter extends SemaphoreRateLimiter {
+public class TokenBucketRateLimiter extends SemaphoreRateLimiter implements Closeable {
+
+ protected final ScheduledExecutorService scheduler;
/**
* 构造
@@ -39,18 +50,26 @@ public class TokenBucketRateLimiter extends SemaphoreRateLimiter {
* @param config 配置
*/
public TokenBucketRateLimiter(final RateLimiterConfig config) {
- super(config, null, configureScheduler());
+ super(config, null);
+ this.scheduler = configureScheduler();
+ //启动定时器
+ scheduleLimitRefresh();
}
@Override
public void refreshLimit() {
- if (this.config.getCapacity() - semaphore.availablePermits() > 0) {
+ final int permitsToFill = this.config.getCapacity() - semaphore.availablePermits();
+ if (permitsToFill > 0) {
// 只有在周期内不满时，才填充
- // 令牌桶的填充主要依靠刷新周期调整令牌填充速度，每次只填充1个令牌
- semaphore.release(1);
+ semaphore.release(Math.min(permitsToFill, config.getMaxReleaseCount()));
}
}
+ @Override
+ public void close() {
+ scheduler.shutdown();
+ }
+
/**
* 创建定时器
*
@@ -60,4 +79,20 @@ public class TokenBucketRateLimiter extends SemaphoreRateLimiter {
final ThreadFactory threadFactory = new NamedThreadFactory("TokenBucketLimiterScheduler-", true);
return new ScheduledThreadPoolExecutor(1, threadFactory);
}
+
+ /**
+ * 启动定时器，未定义则不启动
+ */
+ private void scheduleLimitRefresh() {
+ if (null == this.scheduler) {
+ return;
+ }
+ final long limitRefreshPeriod = this.config.getRefreshPeriod().toNanos();
+ scheduler.scheduleAtFixedRate(
+ this::refreshLimit,
+ limitRefreshPeriod,
+ limitRefreshPeriod,
+ TimeUnit.NANOSECONDS
+ );
+ }
}
diff --git a/hutool-core/src/test/java/org/dromara/hutool/core/thread/ratelimiter/SemaphoreRateLimiterTest.java b/hutool-core/src/test/java/org/dromara/hutool/core/thread/ratelimiter/SemaphoreRateLimiterTest.java
index 187b23291..ea38915e2 100644
--- a/hutool-core/src/test/java/org/dromara/hutool/core/thread/ratelimiter/SemaphoreRateLimiterTest.java
+++ b/hutool-core/src/test/java/org/dromara/hutool/core/thread/ratelimiter/SemaphoreRateLimiterTest.java
@@ -10,8 +10,12 @@ public class SemaphoreRateLimiterTest {
@Test
void test() {
- final RateLimiterConfig rateLimiterConfig = RateLimiterConfig.of(Duration.ofSeconds(5), Duration.ofMillis(300), 5);
- final RateLimiter rateLimiter = new FixedRateLimiter(rateLimiterConfig);
+ final RateLimiterConfig rateLimiterConfig = RateLimiterConfig.of()
+ .setCapacity(5)
+ .setMaxReleaseCount(5)
+ .setRefreshPeriod(Duration.ofMillis(300))
+ .setTimeout(Duration.ofSeconds(5));
+ final TokenBucketRateLimiter rateLimiter = new TokenBucketRateLimiter(rateLimiterConfig);
final boolean b = rateLimiter.tryAcquire(5);
Assertions.assertTrue(b);
@@ -27,5 +31,7 @@ public class SemaphoreRateLimiterTest {
// 超过数量
final boolean b3 = rateLimiter.tryAcquire(1);
Assertions.assertFalse(b3);
+
+ rateLimiter.close();
}
}