Skip to content

Commit f4577dc

Browse files
RobWinRobWin
authored
Issue ReactiveX#537: Resilience4j Aspects should be only available when AspectJ is on classpath
1 parent 176eb21 commit f4577dc

File tree

10 files changed

+123
-95
lines changed

10 files changed

+123
-95
lines changed

‎resilience4j-spring-boot-common/src/main/java/io/github/resilience4j/bulkhead/autoconfigure/AbstractBulkheadConfigurationOnMissingBean.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,14 @@
1717

1818
import io.github.resilience4j.bulkhead.BulkheadRegistry;
1919
import io.github.resilience4j.bulkhead.ThreadPoolBulkheadRegistry;
20-
import io.github.resilience4j.bulkhead.configure.BulkheadAspect;
21-
import io.github.resilience4j.bulkhead.configure.BulkheadAspectExt;
22-
import io.github.resilience4j.bulkhead.configure.BulkheadConfiguration;
23-
import io.github.resilience4j.bulkhead.configure.BulkheadConfigurationProperties;
24-
import io.github.resilience4j.bulkhead.configure.ReactorBulkheadAspectExt;
25-
import io.github.resilience4j.bulkhead.configure.RxJava2BulkheadAspectExt;
20+
import io.github.resilience4j.bulkhead.configure.*;
2621
import io.github.resilience4j.bulkhead.configure.threadpool.ThreadPoolBulkheadConfiguration;
2722
import io.github.resilience4j.bulkhead.event.BulkheadEvent;
2823
import io.github.resilience4j.common.bulkhead.configuration.ThreadPoolBulkheadConfigurationProperties;
2924
import io.github.resilience4j.consumer.EventConsumerRegistry;
3025
import io.github.resilience4j.fallback.FallbackDecorators;
3126
import io.github.resilience4j.fallback.autoconfigure.FallbackConfigurationOnMissingBean;
27+
import io.github.resilience4j.utils.AspectJOnClasspathCondition;
3228
import io.github.resilience4j.utils.ReactorOnClasspathCondition;
3329
import io.github.resilience4j.utils.RxJava2OnClasspathCondition;
3430
import org.springframework.beans.factory.annotation.Autowired;
@@ -64,6 +60,7 @@ public BulkheadRegistry bulkheadRegistry(BulkheadConfigurationProperties bulkhea
6460
}
6561

6662
@Bean
63+
@Conditional(value = {AspectJOnClasspathCondition.class})
6764
@ConditionalOnMissingBean
6865
public BulkheadAspect bulkheadAspect(BulkheadConfigurationProperties bulkheadConfigurationProperties, ThreadPoolBulkheadRegistry threadPoolBulkheadRegistry,
6966
BulkheadRegistry bulkheadRegistry, @Autowired(required = false) List<BulkheadAspectExt> bulkHeadAspectExtList,
@@ -72,14 +69,14 @@ public BulkheadAspect bulkheadAspect(BulkheadConfigurationProperties bulkheadCon
7269
}
7370

7471
@Bean
75-
@Conditional(value = {RxJava2OnClasspathCondition.class})
72+
@Conditional(value = {RxJava2OnClasspathCondition.class, AspectJOnClasspathCondition.class})
7673
@ConditionalOnMissingBean
7774
public RxJava2BulkheadAspectExt rxJava2BulkHeadAspectExt() {
7875
return bulkheadConfiguration.rxJava2BulkHeadAspectExt();
7976
}
8077

8178
@Bean
82-
@Conditional(value = {ReactorOnClasspathCondition.class})
79+
@Conditional(value = {ReactorOnClasspathCondition.class, AspectJOnClasspathCondition.class})
8380
@ConditionalOnMissingBean
8481
public ReactorBulkheadAspectExt reactorBulkHeadAspectExt() {
8582
return bulkheadConfiguration.reactorBulkHeadAspectExt();

‎resilience4j-spring-boot-common/src/main/java/io/github/resilience4j/circuitbreaker/autoconfigure/AbstractCircuitBreakerConfigurationOnMissingBean.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import io.github.resilience4j.consumer.EventConsumerRegistry;
2323
import io.github.resilience4j.fallback.FallbackDecorators;
2424
import io.github.resilience4j.fallback.autoconfigure.FallbackConfigurationOnMissingBean;
25+
import io.github.resilience4j.utils.AspectJOnClasspathCondition;
2526
import io.github.resilience4j.utils.ReactorOnClasspathCondition;
2627
import io.github.resilience4j.utils.RxJava2OnClasspathCondition;
2728
import org.springframework.beans.factory.annotation.Autowired;
@@ -67,21 +68,22 @@ public CircuitBreakerRegistry circuitBreakerRegistry(EventConsumerRegistry<Circu
6768

6869
@Bean
6970
@ConditionalOnMissingBean
71+
@Conditional(value = {AspectJOnClasspathCondition.class})
7072
public CircuitBreakerAspect circuitBreakerAspect(CircuitBreakerRegistry circuitBreakerRegistry,
7173
@Autowired(required = false) List<CircuitBreakerAspectExt> circuitBreakerAspectExtList,
7274
FallbackDecorators fallbackDecorators) {
7375
return circuitBreakerConfiguration.circuitBreakerAspect(circuitBreakerRegistry, circuitBreakerAspectExtList, fallbackDecorators);
7476
}
7577

7678
@Bean
77-
@Conditional(value = {RxJava2OnClasspathCondition.class})
79+
@Conditional(value = {RxJava2OnClasspathCondition.class, AspectJOnClasspathCondition.class})
7880
@ConditionalOnMissingBean
7981
public RxJava2CircuitBreakerAspectExt rxJava2CircuitBreakerAspect() {
8082
return circuitBreakerConfiguration.rxJava2CircuitBreakerAspect();
8183
}
8284

8385
@Bean
84-
@Conditional(value = {ReactorOnClasspathCondition.class})
86+
@Conditional(value = {ReactorOnClasspathCondition.class, AspectJOnClasspathCondition.class})
8587
@ConditionalOnMissingBean
8688
public ReactorCircuitBreakerAspectExt reactorCircuitBreakerAspect() {
8789
return circuitBreakerConfiguration.reactorCircuitBreakerAspect();

‎resilience4j-spring-boot-common/src/main/java/io/github/resilience4j/ratelimiter/autoconfigure/AbstractRateLimiterConfigurationOnMissingBean.java

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,23 @@
1515
*/
1616
package io.github.resilience4j.ratelimiter.autoconfigure;
1717

18-
import java.util.List;
19-
18+
import io.github.resilience4j.consumer.EventConsumerRegistry;
19+
import io.github.resilience4j.fallback.FallbackDecorators;
20+
import io.github.resilience4j.fallback.autoconfigure.FallbackConfigurationOnMissingBean;
21+
import io.github.resilience4j.ratelimiter.RateLimiterRegistry;
22+
import io.github.resilience4j.ratelimiter.configure.*;
23+
import io.github.resilience4j.ratelimiter.event.RateLimiterEvent;
24+
import io.github.resilience4j.utils.AspectJOnClasspathCondition;
25+
import io.github.resilience4j.utils.ReactorOnClasspathCondition;
26+
import io.github.resilience4j.utils.RxJava2OnClasspathCondition;
2027
import org.springframework.beans.factory.annotation.Autowired;
2128
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
2229
import org.springframework.context.annotation.Bean;
2330
import org.springframework.context.annotation.Conditional;
2431
import org.springframework.context.annotation.Configuration;
2532
import org.springframework.context.annotation.Import;
2633

27-
import io.github.resilience4j.consumer.EventConsumerRegistry;
28-
import io.github.resilience4j.ratelimiter.RateLimiterRegistry;
29-
import io.github.resilience4j.ratelimiter.configure.RateLimiterAspect;
30-
import io.github.resilience4j.ratelimiter.configure.RateLimiterAspectExt;
31-
import io.github.resilience4j.ratelimiter.configure.RateLimiterConfiguration;
32-
import io.github.resilience4j.ratelimiter.configure.RateLimiterConfigurationProperties;
33-
import io.github.resilience4j.ratelimiter.configure.ReactorRateLimiterAspectExt;
34-
import io.github.resilience4j.ratelimiter.configure.RxJava2RateLimiterAspectExt;
35-
import io.github.resilience4j.ratelimiter.event.RateLimiterEvent;
36-
import io.github.resilience4j.fallback.FallbackDecorators;
37-
import io.github.resilience4j.fallback.autoconfigure.FallbackConfigurationOnMissingBean;
38-
import io.github.resilience4j.utils.ReactorOnClasspathCondition;
39-
import io.github.resilience4j.utils.RxJava2OnClasspathCondition;
34+
import java.util.List;
4035

4136
@Configuration
4237
@Import(FallbackConfigurationOnMissingBean.class)
@@ -55,20 +50,21 @@ public RateLimiterRegistry rateLimiterRegistry(RateLimiterConfigurationPropertie
5550
}
5651

5752
@Bean
53+
@Conditional(value = {AspectJOnClasspathCondition.class})
5854
@ConditionalOnMissingBean
5955
public RateLimiterAspect rateLimiterAspect(RateLimiterConfigurationProperties rateLimiterProperties, RateLimiterRegistry rateLimiterRegistry, @Autowired(required = false) List<RateLimiterAspectExt> rateLimiterAspectExtList, FallbackDecorators fallbackDecorators) {
6056
return rateLimiterConfiguration.rateLimiterAspect(rateLimiterProperties, rateLimiterRegistry, rateLimiterAspectExtList, fallbackDecorators);
6157
}
6258

6359
@Bean
64-
@Conditional(value = {RxJava2OnClasspathCondition.class})
60+
@Conditional(value = {RxJava2OnClasspathCondition.class, AspectJOnClasspathCondition.class})
6561
@ConditionalOnMissingBean
66-
public RxJava2RateLimiterAspectExt rxJava2RateLimterAspectExt() {
67-
return rateLimiterConfiguration.rxJava2RateLimterAspectExt();
62+
public RxJava2RateLimiterAspectExt rxJava2RateLimiterAspectExt() {
63+
return rateLimiterConfiguration.rxJava2RateLimiterAspectExt();
6864
}
6965

7066
@Bean
71-
@Conditional(value = {ReactorOnClasspathCondition.class})
67+
@Conditional(value = {ReactorOnClasspathCondition.class, AspectJOnClasspathCondition.class})
7268
@ConditionalOnMissingBean
7369
public ReactorRateLimiterAspectExt reactorRateLimiterAspectExt() {
7470
return rateLimiterConfiguration.reactorRateLimiterAspectExt();

‎resilience4j-spring-boot-common/src/main/java/io/github/resilience4j/retry/autoconfigure/AbstractRetryConfigurationOnMissingBean.java

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,23 @@
1515
*/
1616
package io.github.resilience4j.retry.autoconfigure;
1717

18-
import java.util.List;
19-
20-
import org.springframework.beans.factory.annotation.Autowired;
21-
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
22-
import org.springframework.context.annotation.Bean;
23-
import org.springframework.context.annotation.Conditional;
24-
import org.springframework.context.annotation.Configuration;
25-
import org.springframework.context.annotation.Import;
26-
2718
import io.github.resilience4j.consumer.EventConsumerRegistry;
2819
import io.github.resilience4j.fallback.FallbackDecorators;
2920
import io.github.resilience4j.fallback.autoconfigure.FallbackConfigurationOnMissingBean;
3021
import io.github.resilience4j.retry.RetryRegistry;
31-
import io.github.resilience4j.retry.configure.ReactorRetryAspectExt;
32-
import io.github.resilience4j.retry.configure.RetryAspect;
33-
import io.github.resilience4j.retry.configure.RetryAspectExt;
34-
import io.github.resilience4j.retry.configure.RetryConfiguration;
35-
import io.github.resilience4j.retry.configure.RetryConfigurationProperties;
36-
import io.github.resilience4j.retry.configure.RxJava2RetryAspectExt;
22+
import io.github.resilience4j.retry.configure.*;
3723
import io.github.resilience4j.retry.event.RetryEvent;
24+
import io.github.resilience4j.utils.AspectJOnClasspathCondition;
3825
import io.github.resilience4j.utils.ReactorOnClasspathCondition;
3926
import io.github.resilience4j.utils.RxJava2OnClasspathCondition;
27+
import org.springframework.beans.factory.annotation.Autowired;
28+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
29+
import org.springframework.context.annotation.Bean;
30+
import org.springframework.context.annotation.Conditional;
31+
import org.springframework.context.annotation.Configuration;
32+
import org.springframework.context.annotation.Import;
33+
34+
import java.util.List;
4035

4136
/**
4237
* {@link Configuration
@@ -69,6 +64,7 @@ public RetryRegistry retryRegistry(RetryConfigurationProperties retryConfigurati
6964
* @return the spring retry AOP aspect
7065
*/
7166
@Bean
67+
@Conditional(value = {AspectJOnClasspathCondition.class})
7268
@ConditionalOnMissingBean
7369
public RetryAspect retryAspect(RetryConfigurationProperties retryConfigurationProperties,
7470
RetryRegistry retryRegistry, @Autowired(required = false) List<RetryAspectExt> retryAspectExtList,
@@ -77,14 +73,14 @@ public RetryAspect retryAspect(RetryConfigurationProperties retryConfigurationPr
7773
}
7874

7975
@Bean
80-
@Conditional(value = {RxJava2OnClasspathCondition.class})
76+
@Conditional(value = {RxJava2OnClasspathCondition.class, AspectJOnClasspathCondition.class})
8177
@ConditionalOnMissingBean
8278
public RxJava2RetryAspectExt rxJava2RetryAspectExt() {
8379
return retryConfiguration.rxJava2RetryAspectExt();
8480
}
8581

8682
@Bean
87-
@Conditional(value = {ReactorOnClasspathCondition.class})
83+
@Conditional(value = {ReactorOnClasspathCondition.class, AspectJOnClasspathCondition.class})
8884
@ConditionalOnMissingBean
8985
public ReactorRetryAspectExt reactorRetryAspectExt() {
9086
return retryConfiguration.reactorRetryAspectExt();

‎resilience4j-spring-boot-common/src/test/java/io/github/resilience4j/SpringBootCommonTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void testRetryCommonConfig() {
7777
public void testRateLimiterCommonConfig() {
7878
RateLimiterConfigurationOnMissingBean rateLimiterConfigurationOnMissingBean = new RateLimiterConfigurationOnMissingBean();
7979
assertThat(rateLimiterConfigurationOnMissingBean.reactorRateLimiterAspectExt()).isNotNull();
80-
assertThat(rateLimiterConfigurationOnMissingBean.rxJava2RateLimterAspectExt()).isNotNull();
80+
assertThat(rateLimiterConfigurationOnMissingBean.rxJava2RateLimiterAspectExt()).isNotNull();
8181
assertThat(rateLimiterConfigurationOnMissingBean.rateLimiterRegistry(new RateLimiterConfigurationProperties(), new DefaultEventConsumerRegistry<>())).isNotNull();
8282
assertThat(rateLimiterConfigurationOnMissingBean.rateLimiterAspect(new RateLimiterConfigurationProperties(), RateLimiterRegistry.ofDefaults(), Collections.emptyList(), new FallbackDecorators(Arrays.asList(new CompletionStageFallbackDecorator()))));
8383
}

‎resilience4j-spring/src/main/java/io/github/resilience4j/bulkhead/configure/BulkheadConfiguration.java

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,6 @@
1515
*/
1616
package io.github.resilience4j.bulkhead.configure;
1717

18-
import java.util.List;
19-
import java.util.Map;
20-
import java.util.Optional;
21-
import java.util.stream.Collectors;
22-
23-
import org.springframework.beans.factory.annotation.Autowired;
24-
import org.springframework.context.annotation.Bean;
25-
import org.springframework.context.annotation.Conditional;
26-
import org.springframework.context.annotation.Configuration;
27-
import org.springframework.context.annotation.Import;
28-
2918
import io.github.resilience4j.bulkhead.Bulkhead;
3019
import io.github.resilience4j.bulkhead.BulkheadConfig;
3120
import io.github.resilience4j.bulkhead.BulkheadRegistry;
@@ -36,8 +25,19 @@
3625
import io.github.resilience4j.consumer.EventConsumerRegistry;
3726
import io.github.resilience4j.fallback.FallbackDecorators;
3827
import io.github.resilience4j.fallback.configure.FallbackConfiguration;
28+
import io.github.resilience4j.utils.AspectJOnClasspathCondition;
3929
import io.github.resilience4j.utils.ReactorOnClasspathCondition;
4030
import io.github.resilience4j.utils.RxJava2OnClasspathCondition;
31+
import org.springframework.beans.factory.annotation.Autowired;
32+
import org.springframework.context.annotation.Bean;
33+
import org.springframework.context.annotation.Conditional;
34+
import org.springframework.context.annotation.Configuration;
35+
import org.springframework.context.annotation.Import;
36+
37+
import java.util.List;
38+
import java.util.Map;
39+
import java.util.Optional;
40+
import java.util.stream.Collectors;
4141

4242
/**
4343
* {@link Configuration
@@ -94,20 +94,21 @@ private void registerEventConsumer(EventConsumerRegistry<BulkheadEvent> eventCon
9494
}
9595

9696
@Bean
97+
@Conditional(value = {AspectJOnClasspathCondition.class})
9798
public BulkheadAspect bulkheadAspect(BulkheadConfigurationProperties bulkheadConfigurationProperties, ThreadPoolBulkheadRegistry threadPoolBulkheadRegistry,
9899
BulkheadRegistry bulkheadRegistry, @Autowired(required = false) List<BulkheadAspectExt> bulkHeadAspectExtList,
99100
FallbackDecorators fallbackDecorators) {
100101
return new BulkheadAspect(bulkheadConfigurationProperties, threadPoolBulkheadRegistry, bulkheadRegistry, bulkHeadAspectExtList, fallbackDecorators);
101102
}
102103

103104
@Bean
104-
@Conditional(value = {RxJava2OnClasspathCondition.class})
105+
@Conditional(value = {RxJava2OnClasspathCondition.class, AspectJOnClasspathCondition.class})
105106
public RxJava2BulkheadAspectExt rxJava2BulkHeadAspectExt() {
106107
return new RxJava2BulkheadAspectExt();
107108
}
108109

109110
@Bean
110-
@Conditional(value = {ReactorOnClasspathCondition.class})
111+
@Conditional(value = {ReactorOnClasspathCondition.class, AspectJOnClasspathCondition.class})
111112
public ReactorBulkheadAspectExt reactorBulkHeadAspectExt() {
112113
return new ReactorBulkheadAspectExt();
113114
}

‎resilience4j-spring/src/main/java/io/github/resilience4j/circuitbreaker/configure/CircuitBreakerConfiguration.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,24 +15,24 @@
1515
*/
1616
package io.github.resilience4j.circuitbreaker.configure;
1717

18-
import java.util.List;
19-
import java.util.Map;
20-
import java.util.stream.Collectors;
21-
22-
import org.springframework.beans.factory.annotation.Autowired;
23-
import org.springframework.context.annotation.Bean;
24-
import org.springframework.context.annotation.Conditional;
25-
import org.springframework.context.annotation.Configuration;
26-
2718
import io.github.resilience4j.circuitbreaker.CircuitBreaker;
2819
import io.github.resilience4j.circuitbreaker.CircuitBreakerConfig;
2920
import io.github.resilience4j.circuitbreaker.CircuitBreakerRegistry;
3021
import io.github.resilience4j.circuitbreaker.event.CircuitBreakerEvent;
3122
import io.github.resilience4j.consumer.DefaultEventConsumerRegistry;
3223
import io.github.resilience4j.consumer.EventConsumerRegistry;
3324
import io.github.resilience4j.fallback.FallbackDecorators;
25+
import io.github.resilience4j.utils.AspectJOnClasspathCondition;
3426
import io.github.resilience4j.utils.ReactorOnClasspathCondition;
3527
import io.github.resilience4j.utils.RxJava2OnClasspathCondition;
28+
import org.springframework.beans.factory.annotation.Autowired;
29+
import org.springframework.context.annotation.Bean;
30+
import org.springframework.context.annotation.Conditional;
31+
import org.springframework.context.annotation.Configuration;
32+
33+
import java.util.List;
34+
import java.util.Map;
35+
import java.util.stream.Collectors;
3636

3737
/**
3838
* {@link org.springframework.context.annotation.Configuration
@@ -56,6 +56,7 @@ public CircuitBreakerRegistry circuitBreakerRegistry(EventConsumerRegistry<Circu
5656
}
5757

5858
@Bean
59+
@Conditional(value = {AspectJOnClasspathCondition.class})
5960
public CircuitBreakerAspect circuitBreakerAspect(CircuitBreakerRegistry circuitBreakerRegistry,
6061
@Autowired(required = false) List<CircuitBreakerAspectExt> circuitBreakerAspectExtList,
6162
FallbackDecorators fallbackDecorators) {
@@ -64,13 +65,13 @@ public CircuitBreakerAspect circuitBreakerAspect(CircuitBreakerRegistry circuitB
6465

6566

6667
@Bean
67-
@Conditional(value = {RxJava2OnClasspathCondition.class})
68+
@Conditional(value = {RxJava2OnClasspathCondition.class, AspectJOnClasspathCondition.class})
6869
public RxJava2CircuitBreakerAspectExt rxJava2CircuitBreakerAspect() {
6970
return new RxJava2CircuitBreakerAspectExt();
7071
}
7172

7273
@Bean
73-
@Conditional(value = {ReactorOnClasspathCondition.class})
74+
@Conditional(value = {ReactorOnClasspathCondition.class, AspectJOnClasspathCondition.class})
7475
public ReactorCircuitBreakerAspectExt reactorCircuitBreakerAspect() {
7576
return new ReactorCircuitBreakerAspectExt();
7677
}

‎resilience4j-spring/src/main/java/io/github/resilience4j/ratelimiter/configure/RateLimiterConfiguration.java

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@
1616
package io.github.resilience4j.ratelimiter.configure;
1717

1818

19-
import java.util.List;
20-
import java.util.Map;
21-
import java.util.stream.Collectors;
22-
23-
import org.springframework.beans.factory.annotation.Autowired;
24-
import org.springframework.context.annotation.Bean;
25-
import org.springframework.context.annotation.Conditional;
26-
import org.springframework.context.annotation.Configuration;
27-
2819
import io.github.resilience4j.consumer.DefaultEventConsumerRegistry;
2920
import io.github.resilience4j.consumer.EventConsumerRegistry;
3021
import io.github.resilience4j.fallback.FallbackDecorators;
3122
import io.github.resilience4j.ratelimiter.RateLimiter;
3223
import io.github.resilience4j.ratelimiter.RateLimiterConfig;
3324
import io.github.resilience4j.ratelimiter.RateLimiterRegistry;
3425
import io.github.resilience4j.ratelimiter.event.RateLimiterEvent;
26+
import io.github.resilience4j.utils.AspectJOnClasspathCondition;
3527
import io.github.resilience4j.utils.ReactorOnClasspathCondition;
3628
import io.github.resilience4j.utils.RxJava2OnClasspathCondition;
29+
import org.springframework.beans.factory.annotation.Autowired;
30+
import org.springframework.context.annotation.Bean;
31+
import org.springframework.context.annotation.Conditional;
32+
import org.springframework.context.annotation.Configuration;
33+
34+
import java.util.List;
35+
import java.util.Map;
36+
import java.util.stream.Collectors;
3737

3838
/**
3939
* {@link org.springframework.context.annotation.Configuration
@@ -86,18 +86,19 @@ private void registerEventConsumer(EventConsumerRegistry<RateLimiterEvent> event
8686
}
8787

8888
@Bean
89+
@Conditional(value = {AspectJOnClasspathCondition.class})
8990
public RateLimiterAspect rateLimiterAspect(RateLimiterConfigurationProperties rateLimiterProperties, RateLimiterRegistry rateLimiterRegistry, @Autowired(required = false) List<RateLimiterAspectExt> rateLimiterAspectExtList, FallbackDecorators fallbackDecorators) {
9091
return new RateLimiterAspect(rateLimiterRegistry, rateLimiterProperties, rateLimiterAspectExtList, fallbackDecorators);
9192
}
9293

9394
@Bean
94-
@Conditional(value = {RxJava2OnClasspathCondition.class})
95-
public RxJava2RateLimiterAspectExt rxJava2RateLimterAspectExt() {
95+
@Conditional(value = {RxJava2OnClasspathCondition.class, AspectJOnClasspathCondition.class})
96+
public RxJava2RateLimiterAspectExt rxJava2RateLimiterAspectExt() {
9697
return new RxJava2RateLimiterAspectExt();
9798
}
9899

99100
@Bean
100-
@Conditional(value = {ReactorOnClasspathCondition.class})
101+
@Conditional(value = {ReactorOnClasspathCondition.class, AspectJOnClasspathCondition.class})
101102
public ReactorRateLimiterAspectExt reactorRateLimiterAspectExt() {
102103
return new ReactorRateLimiterAspectExt();
103104
}

0 commit comments

Comments
 (0)