Skip to content

S
spring-boot
Commit 325b2b09 authored by Phillip Webb's avatar Phillip Webb
Browse files
Options

Merge pull request #10590 from spencergibb/patch-1 

* pr/10590:
  Change @ConditionalOnClass from Servlet to Flux
parents f3373238 ce2058fa
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextAutoConfiguration.java
View file @ 325b2b09
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
package org.springframework.boot.actuate.autoconfigure.web.reactive; package org.springframework.boot.actuate.autoconfigure.web.reactive;
import javax.servlet.Servlet; import reactor.core.publisher.Flux;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
...@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration; ...@@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration;
* @since 2.0.0 * @since 2.0.0
*/ */
@Configuration @Configuration
@ConditionalOnClass(Servlet.class) @ConditionalOnClass(Flux.class)
@ConditionalOnWebApplication(type = Type.REACTIVE) @ConditionalOnWebApplication(type = Type.REACTIVE)
public class ReactiveManagementContextAutoConfiguration { public class ReactiveManagementContextAutoConfiguration {
......
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