admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Consistently throw Task/InvocationRejectedException on access rejected

Browse Source 
Closes gh-36167
This commit is contained in:
Juergen Hoeller
2026-01-18 15:39:58 +01:00
parent 3f390d55f0
commit 2d2809f45c
5 changed files with 53 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-context/src/main/java/org/springframework/resilience/annotation/ConcurrencyLimitBeanPostProcessor.java
+19 -8
View File
@@ -117,11 +117,10 @@ public class ConcurrencyLimitBeanPostProcessor extends AbstractBeanFactoryAwareA
if (concurrencyLimit < -1) {
throw new IllegalStateException(annotation + " must be configured with a valid limit");
}
String name = (perMethod ? ClassUtils.getQualifiedMethodName(method) : targetClass.getName());
interceptor = (annotation.policy() == ConcurrencyLimit.ThrottlePolicy.REJECT ?
new RejectingConcurrencyThrottleInterceptor(concurrencyLimit,
(perMethod ? ClassUtils.getQualifiedMethodName(method) : targetClass.getName()),
instance) :
new ConcurrencyThrottleInterceptor(concurrencyLimit));
new RejectingConcurrencyThrottleInterceptor(concurrencyLimit, name, instance) :
new ResilienceConcurrencyThrottleInterceptor(concurrencyLimit, name, instance));
if (!perMethod) {
holder.classInterceptor = interceptor;
}
@@ -155,22 +154,34 @@ public class ConcurrencyLimitBeanPostProcessor extends AbstractBeanFactoryAwareA
}
private static class RejectingConcurrencyThrottleInterceptor extends ConcurrencyThrottleInterceptor {
private static class ResilienceConcurrencyThrottleInterceptor extends ConcurrencyThrottleInterceptor {
private final String identifier;
private final Object target;
public RejectingConcurrencyThrottleInterceptor(int concurrencyLimit, String identifier, Object target) {
public ResilienceConcurrencyThrottleInterceptor(int concurrencyLimit, String identifier, Object target) {
super(concurrencyLimit);
this.identifier = identifier;
this.target = target;
}
@Override
protected void onAccessRejected(String msg) {
throw new InvocationRejectedException(msg + " " + this.identifier, this.target);
}
}
private static class RejectingConcurrencyThrottleInterceptor extends ResilienceConcurrencyThrottleInterceptor {
public RejectingConcurrencyThrottleInterceptor(int concurrencyLimit, String identifier, Object target) {
super(concurrencyLimit, identifier, target);
}
@Override
protected void onLimitReached() {
throw new InvocationRejectedException(
"Concurrency limit reached for " + this.identifier + ": " + getConcurrencyLimit(), this.target);
onAccessRejected("Concurrency limit reached: " + getConcurrencyLimit() + " - not allowed to enter");
}
}