spring/spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework.git synced 2026-10-07 15:39:29 +00:00
Code Issues Projects Releases Wiki Activity

Add configurable throttle policy to @ConcurrencyLimit annotation

Browse Source 
Closes gh-36109
This commit is contained in:
Juergen Hoeller
2026-01-08 15:50:57 +01:00
parent 644072f7ea
commit 38f5f4de8e
5 changed files with 234 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-context/src/test/java/org/springframework/resilience/ConcurrencyLimitTests.java
+111 -6
View File
@@ -37,6 +37,7 @@ import org.springframework.resilience.annotation.EnableResilientMethods;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
import static org.springframework.resilience.annotation.ConcurrencyLimit.ThrottlePolicy.REJECT;
/**
* @author Juergen Hoeller
@@ -89,6 +90,26 @@ class ConcurrencyLimitTests {
assertThat(target.current).hasValue(10);
}
@Test
void withPostProcessorForMethodWithRejection() throws Exception{
AnnotatedMethodBean proxy = createProxy(AnnotatedMethodBean.class);
AnnotatedMethodBean target = (AnnotatedMethodBean) AopProxyUtils.getSingletonTarget(proxy);
List<CompletableFuture<?>> futures = new ArrayList<>(10);
for (int i = 0; i < 2; i++) {
futures.add(CompletableFuture.runAsync(proxy::rejectingOperation));
}
Thread.sleep(10);
for (int i = 2; i < 10; i++) {
futures.add(CompletableFuture.runAsync(() ->
assertThatExceptionOfType(InvocationRejectedException.class).isThrownBy(proxy::rejectingOperation)
.withMessageContaining(AnnotatedMethodBean.class.getName() + ".rejectingOperation")
.satisfies(ex -> assertThat(ex.getTarget() == target))));
}
CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
assertThat(target.current).hasValue(2);
}
@Test
void withPostProcessorForClass() {
AnnotatedClassBean proxy = createProxy(AnnotatedClassBean.class);
@@ -108,6 +129,30 @@ class ConcurrencyLimitTests {
assertThat(target.current).hasValue(0);
}
@Test
void withPostProcessorForClassWithRejection() throws Exception {
AnnotatedClassBeanWithRejection proxy = createProxy(AnnotatedClassBeanWithRejection.class);
AnnotatedClassBeanWithRejection target = (AnnotatedClassBeanWithRejection) AopProxyUtils.getSingletonTarget(proxy);
List<CompletableFuture<?>> futures = new ArrayList<>(30);
futures.add(CompletableFuture.runAsync(proxy::concurrentOperation));
futures.add(CompletableFuture.runAsync(proxy::otherOperation));
Thread.sleep(10);
futures.add(CompletableFuture.runAsync(() ->
assertThatExceptionOfType(InvocationRejectedException.class).isThrownBy(proxy::concurrentOperation)
.withMessageContaining(AnnotatedClassBeanWithRejection.class.getName())
.satisfies(ex -> assertThat(ex.getTarget() == target))));
futures.add(CompletableFuture.runAsync(() ->
assertThatExceptionOfType(InvocationRejectedException.class).isThrownBy(proxy::otherOperation)
.withMessageContaining(AnnotatedClassBeanWithRejection.class.getName())
.satisfies(ex -> assertThat(ex.getTarget() == target))));
for (int i = 0; i < 10; i++) {
futures.add(CompletableFuture.runAsync(proxy::overrideOperation));
}
CompletableFuture.allOf(futures.toArray(new CompletableFuture[0])).join();
assertThat(target.current).hasValue(0);
}
@Test
void withPlaceholderResolution() {
MockPropertySource mockPropertySource = new MockPropertySource("test").withProperty("test.concurrency.limit", "3");
@@ -197,7 +242,7 @@ class ConcurrencyLimitTests {
throw new IllegalStateException();
}
try {
Thread.sleep(10);
Thread.sleep(100);
}
catch (InterruptedException ex) {
throw new IllegalStateException(ex);
@@ -209,7 +254,18 @@ class ConcurrencyLimitTests {
public void unboundedConcurrency() {
current.incrementAndGet();
try {
Thread.sleep(10);
Thread.sleep(100);
}
catch (InterruptedException ex) {
throw new IllegalStateException(ex);
}
}
@ConcurrencyLimit(limit = 2, policy = REJECT)
public void rejectingOperation() {
current.incrementAndGet();
try {
Thread.sleep(100);
}
catch (InterruptedException ex) {
throw new IllegalStateException(ex);
@@ -230,7 +286,7 @@ class ConcurrencyLimitTests {
throw new IllegalStateException();
}
try {
Thread.sleep(10);
Thread.sleep(100);
}
catch (InterruptedException ex) {
throw new IllegalStateException(ex);
@@ -243,7 +299,7 @@ class ConcurrencyLimitTests {
throw new IllegalStateException();
}
try {
Thread.sleep(10);
Thread.sleep(100);
}
catch (InterruptedException ex) {
throw new IllegalStateException(ex);
@@ -257,7 +313,56 @@ class ConcurrencyLimitTests {
throw new IllegalStateException();
}
try {
Thread.sleep(10);
Thread.sleep(100);
}
catch (InterruptedException ex) {
throw new IllegalStateException(ex);
}
currentOverride.decrementAndGet();
}
}
@ConcurrencyLimit(limit = 2, policy = REJECT)
static class AnnotatedClassBeanWithRejection {
final AtomicInteger current = new AtomicInteger();
final AtomicInteger currentOverride = new AtomicInteger();
public void concurrentOperation() {
if (current.incrementAndGet() > 2) {
throw new IllegalStateException();
}
try {
Thread.sleep(100);
}
catch (InterruptedException ex) {
throw new IllegalStateException(ex);
}
current.decrementAndGet();
}
public void otherOperation() {
if (current.incrementAndGet() > 2) {
throw new IllegalStateException();
}
try {
Thread.sleep(100);
}
catch (InterruptedException ex) {
throw new IllegalStateException(ex);
}
current.decrementAndGet();
}
@ConcurrencyLimit(limit = 1)
public void overrideOperation() {
if (currentOverride.incrementAndGet() > 1) {
throw new IllegalStateException();
}
try {
Thread.sleep(100);
}
catch (InterruptedException ex) {
throw new IllegalStateException(ex);
@@ -282,7 +387,7 @@ class ConcurrencyLimitTests {
throw new IllegalStateException();
}
try {
Thread.sleep(10);
Thread.sleep(100);
}
catch (InterruptedException ex) {
throw new IllegalStateException(ex);