Issue ReactiveX#756: Spring Boot 2 module must work without an Spring actuator. (ReactiveX#753)

Author: wonwoo

resilience4j-spring-boot2/src/main/java/io/github/resilience4j/bulkhead/autoconfigure/BulkheadAutoConfiguration.java

@@ -23,10 +23,8 @@
 import io.github.resilience4j.bulkhead.monitoring.endpoint.BulkheadEventsEndpoint;
 import io.github.resilience4j.consumer.EventConsumerRegistry;
 import io.github.resilience4j.fallback.autoconfigure.FallbackConfigurationOnMissingBean;
-import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -41,22 +39,24 @@
 @ConditionalOnClass(Bulkhead.class)
 @EnableConfigurationProperties({BulkheadProperties.class, ThreadPoolBulkheadProperties.class})
 @Import({BulkheadConfigurationOnMissingBean.class, FallbackConfigurationOnMissingBean.class})
-@AutoConfigureBefore(EndpointAutoConfiguration.class)
 public class BulkheadAutoConfiguration {
 
-    @Bean
-    @ConditionalOnEnabledEndpoint
-    @ConditionalOnClass(value = {Endpoint.class})
-    public BulkheadEndpoint bulkheadEndpoint(BulkheadRegistry bulkheadRegistry,
-        ThreadPoolBulkheadRegistry threadPoolBulkheadRegistry) {
-        return new BulkheadEndpoint(bulkheadRegistry, threadPoolBulkheadRegistry);
-    }
+    @Configuration
+    @ConditionalOnClass(Endpoint.class)
+    static class BulkheadEndpointAutoConfiguration {
+
+        @Bean
+        @ConditionalOnEnabledEndpoint
+        public BulkheadEndpoint bulkheadEndpoint(BulkheadRegistry bulkheadRegistry,
+            ThreadPoolBulkheadRegistry threadPoolBulkheadRegistry) {
+            return new BulkheadEndpoint(bulkheadRegistry, threadPoolBulkheadRegistry);
+        }
 
-    @Bean
-    @ConditionalOnEnabledEndpoint
-    @ConditionalOnClass(value = {Endpoint.class})
-    public BulkheadEventsEndpoint bulkheadEventsEndpoint(
-        EventConsumerRegistry<BulkheadEvent> eventConsumerRegistry) {
-        return new BulkheadEventsEndpoint(eventConsumerRegistry);
+        @Bean
+        @ConditionalOnEnabledEndpoint
+        public BulkheadEventsEndpoint bulkheadEventsEndpoint(
+            EventConsumerRegistry<BulkheadEvent> eventConsumerRegistry) {
+            return new BulkheadEventsEndpoint(eventConsumerRegistry);
+        }
     }
 }

resilience4j-spring-boot2/src/main/java/io/github/resilience4j/circuitbreaker/autoconfigure/CircuitBreakerAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Robert Winkler
+ * Copyright 2019 Robert Winkler
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,10 +22,8 @@
 import io.github.resilience4j.circuitbreaker.monitoring.endpoint.CircuitBreakerEventsEndpoint;
 import io.github.resilience4j.consumer.EventConsumerRegistry;
 import io.github.resilience4j.fallback.autoconfigure.FallbackConfigurationOnMissingBean;
-import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -41,23 +39,24 @@
 @ConditionalOnClass(CircuitBreaker.class)
 @EnableConfigurationProperties(CircuitBreakerProperties.class)
 @Import({CircuitBreakerConfigurationOnMissingBean.class, FallbackConfigurationOnMissingBean.class})
-@AutoConfigureBefore(EndpointAutoConfiguration.class)
 public class CircuitBreakerAutoConfiguration {
 
-    @Bean
-    @ConditionalOnEnabledEndpoint
-    @ConditionalOnClass(value = {Endpoint.class})
-    public CircuitBreakerEndpoint circuitBreakerEndpoint(
-        CircuitBreakerRegistry circuitBreakerRegistry) {
-        return new CircuitBreakerEndpoint(circuitBreakerRegistry);
-    }
+    @Configuration
+    @ConditionalOnClass(Endpoint.class)
+    static class CircuitBreakerEndpointAutoConfiguration {
 
-    @Bean
-    @ConditionalOnEnabledEndpoint
-    @ConditionalOnClass(value = {Endpoint.class})
-    public CircuitBreakerEventsEndpoint circuitBreakerEventsEndpoint(
-        EventConsumerRegistry<CircuitBreakerEvent> eventConsumerRegistry) {
-        return new CircuitBreakerEventsEndpoint(eventConsumerRegistry);
-    }
+        @Bean
+        @ConditionalOnEnabledEndpoint
+        public CircuitBreakerEndpoint circuitBreakerEndpoint(
+            CircuitBreakerRegistry circuitBreakerRegistry) {
+            return new CircuitBreakerEndpoint(circuitBreakerRegistry);
+        }
 
+        @Bean
+        @ConditionalOnEnabledEndpoint
+        public CircuitBreakerEventsEndpoint circuitBreakerEventsEndpoint(
+            EventConsumerRegistry<CircuitBreakerEvent> eventConsumerRegistry) {
+            return new CircuitBreakerEventsEndpoint(eventConsumerRegistry);
+        }
+    }
 }

resilience4j-spring-boot2/src/main/java/io/github/resilience4j/ratelimiter/autoconfigure/RateLimiterAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2017 Bohdan Storozhuk
+ * Copyright 2019 Bohdan Storozhuk
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,10 +22,8 @@
 import io.github.resilience4j.ratelimiter.event.RateLimiterEvent;
 import io.github.resilience4j.ratelimiter.monitoring.endpoint.RateLimiterEndpoint;
 import io.github.resilience4j.ratelimiter.monitoring.endpoint.RateLimiterEventsEndpoint;
-import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -40,22 +38,23 @@
 @ConditionalOnClass(RateLimiter.class)
 @EnableConfigurationProperties(RateLimiterProperties.class)
 @Import({RateLimiterConfigurationOnMissingBean.class, FallbackConfigurationOnMissingBean.class})
-@AutoConfigureBefore(EndpointAutoConfiguration.class)
 public class RateLimiterAutoConfiguration {
 
-    @Bean
-    @ConditionalOnEnabledEndpoint
-    @ConditionalOnClass(value = {Endpoint.class})
-    public RateLimiterEndpoint rateLimiterEndpoint(RateLimiterRegistry rateLimiterRegistry) {
-        return new RateLimiterEndpoint(rateLimiterRegistry);
-    }
+    @Configuration
+    @ConditionalOnClass( Endpoint.class)
+    static class RateLimiterEndpointAutoConfiguration {
 
-    @Bean
-    @ConditionalOnEnabledEndpoint
-    @ConditionalOnClass(value = {Endpoint.class})
-    public RateLimiterEventsEndpoint rateLimiterEventsEndpoint(
-        EventConsumerRegistry<RateLimiterEvent> eventConsumerRegistry) {
-        return new RateLimiterEventsEndpoint(eventConsumerRegistry);
-    }
+        @Bean
+        @ConditionalOnEnabledEndpoint
+        public RateLimiterEndpoint rateLimiterEndpoint(RateLimiterRegistry rateLimiterRegistry) {
+            return new RateLimiterEndpoint(rateLimiterRegistry);
+        }
 
+        @Bean
+        @ConditionalOnEnabledEndpoint
+        public RateLimiterEventsEndpoint rateLimiterEventsEndpoint(
+            EventConsumerRegistry<RateLimiterEvent> eventConsumerRegistry) {
+            return new RateLimiterEventsEndpoint(eventConsumerRegistry);
+        }
+    }
 }

resilience4j-spring-boot2/src/main/java/io/github/resilience4j/retry/autoconfigure/RetryAutoConfiguration.java

@@ -41,18 +41,21 @@
 @Import({RetryConfigurationOnMissingBean.class, FallbackConfigurationOnMissingBean.class})
 public class RetryAutoConfiguration {
 
-    @Bean
-    @ConditionalOnEnabledEndpoint
-    @ConditionalOnClass(value = {Endpoint.class})
-    public RetryEndpoint retryEndpoint(RetryRegistry retryRegistry) {
-        return new RetryEndpoint(retryRegistry);
-    }
+    @Configuration
+    @ConditionalOnClass(Endpoint.class)
+    static class RetryAutoEndpointConfiguration {
+
+        @Bean
+        @ConditionalOnEnabledEndpoint
+        public RetryEndpoint retryEndpoint(RetryRegistry retryRegistry) {
+            return new RetryEndpoint(retryRegistry);
+        }
 
-    @Bean
-    @ConditionalOnEnabledEndpoint
-    @ConditionalOnClass(value = {Endpoint.class})
-    public RetryEventsEndpoint retryEventsEndpoint(
-        EventConsumerRegistry<RetryEvent> eventConsumerRegistry) {
-        return new RetryEventsEndpoint(eventConsumerRegistry);
+        @Bean
+        @ConditionalOnEnabledEndpoint
+        public RetryEventsEndpoint retryEventsEndpoint(
+            EventConsumerRegistry<RetryEvent> eventConsumerRegistry) {
+            return new RetryEventsEndpoint(eventConsumerRegistry);
+        }
     }
 }