Webflux Hystrix Feature shouldn't be dependant on Servlet.

parent 4c181c96
...@@ -68,7 +68,7 @@ public class HystrixAutoConfiguration { ...@@ -68,7 +68,7 @@ public class HystrixAutoConfiguration {
@Configuration @Configuration
@ConditionalOnWebApplication(type = SERVLET) @ConditionalOnWebApplication(type = SERVLET)
@ConditionalOnBean(HystrixCommandAspect.class) // only install the stream if enabled @ConditionalOnBean(HystrixCommandAspect.class) // only install the stream if enabled
@ConditionalOnClass({ Health.class, HystrixMetricsStreamServlet.class }) @ConditionalOnClass({ HystrixMetricsStreamServlet.class })
@EnableConfigurationProperties(HystrixProperties.class) @EnableConfigurationProperties(HystrixProperties.class)
protected static class HystrixServletAutoConfiguration { protected static class HystrixServletAutoConfiguration {
...@@ -87,7 +87,7 @@ public class HystrixAutoConfiguration { ...@@ -87,7 +87,7 @@ public class HystrixAutoConfiguration {
@Configuration @Configuration
@ConditionalOnWebApplication(type = REACTIVE) @ConditionalOnWebApplication(type = REACTIVE)
@ConditionalOnBean(HystrixCommandAspect.class) // only install the stream if enabled @ConditionalOnBean(HystrixCommandAspect.class) // only install the stream if enabled
@ConditionalOnClass({ Health.class, DispatcherHandler.class }) @ConditionalOnClass({ DispatcherHandler.class })
@EnableConfigurationProperties(HystrixProperties.class) @EnableConfigurationProperties(HystrixProperties.class)
protected static class HystrixWebfluxManagementContextConfiguration { protected static class HystrixWebfluxManagementContextConfiguration {
...@@ -102,7 +102,7 @@ public class HystrixAutoConfiguration { ...@@ -102,7 +102,7 @@ public class HystrixAutoConfiguration {
@Bean @Bean
public HasFeatures hystrixStreamFeature() { public HasFeatures hystrixStreamFeature() {
return HasFeatures.namedFeature("Hystrix Stream Webflux", HystrixMetricsStreamServlet.class); return HasFeatures.namedFeature("Hystrix Stream Webflux", HystrixWebfluxEndpoint.class);
} }
} }
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment