From ce2058fa97c8e13811a27f103a12c6dd461ed8b4 Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Tue, 10 Oct 2017 21:36:57 -0400 Subject: [PATCH] Change @ConditionalOnClass from Servlet to Flux Update `ReactiveManagementContextAutoConfiguration` to check for a `Flux` class rather than `Servlet`. Closes gh-10590 --- .../reactive/ReactiveManagementContextAutoConfiguration.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextAutoConfiguration.java index e2e4bceec1..b4b480c33d 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextAutoConfiguration.java @@ -16,7 +16,7 @@ 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.condition.ConditionalOnClass; @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Configuration; * @since 2.0.0 */ @Configuration -@ConditionalOnClass(Servlet.class) +@ConditionalOnClass(Flux.class) @ConditionalOnWebApplication(type = Type.REACTIVE) public class ReactiveManagementContextAutoConfiguration {