Move Reactor Netty management server support to s-b-reactor-netty

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure-all/build.gradle

@@ -40,7 +40,6 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-kafka"))
 	optional(project(":spring-boot-project:spring-boot-metrics"))
 	optional(project(":spring-boot-project:spring-boot-r2dbc"))
-	optional(project(":spring-boot-project:spring-boot-reactor-netty"))
 	optional(project(":spring-boot-project:spring-boot-restclient"))
 	optional(project(":spring-boot-project:spring-boot-security-oauth2-client"))
 	optional(project(":spring-boot-project:spring-boot-security-oauth2-resource-server"))
@@ -132,6 +131,7 @@ dependencies {
 
 	testImplementation(project(":spring-boot-project:spring-boot-data-rest"))
 	testImplementation(project(":spring-boot-project:spring-boot-hateoas"))
+	testImplementation(project(":spring-boot-project:spring-boot-reactor-netty"))
 	testImplementation(project(":spring-boot-project:spring-boot-restclient-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-test"))
 	testImplementation(project(":spring-boot-project:spring-boot-tools:spring-boot-test-support"))

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -69,5 +69,4 @@ org.springframework.boot.actuate.autoconfigure.wavefront.WavefrontAutoConfigurat
 org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.web.exchanges.HttpExchangesEndpointAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.web.mappings.MappingsEndpointAutoConfiguration
-org.springframework.boot.actuate.autoconfigure.web.server.netty.NettyReactiveManagementContextAutoConfiguration
 org.springframework.boot.actuate.autoconfigure.web.servlet.ServletManagementContextAutoConfiguration

spring-boot-project/spring-boot-actuator-autoconfigure-all/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebFluxHealthEndpointAdditionalPathIntegrationTests.java

@@ -22,10 +22,10 @@
 import org.springframework.boot.actuate.autoconfigure.health.HealthEndpointAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.system.DiskSpaceHealthContributorAutoConfiguration;
 import org.springframework.boot.actuate.autoconfigure.web.server.ManagementContextAutoConfiguration;
-import org.springframework.boot.actuate.autoconfigure.web.server.netty.NettyReactiveManagementContextAutoConfiguration;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.http.codec.autoconfigure.CodecsAutoConfiguration;
 import org.springframework.boot.jackson.autoconfigure.JacksonAutoConfiguration;
+import org.springframework.boot.reactor.netty.actuate.autoconfigure.web.server.NettyReactiveManagementContextAutoConfiguration;
 import org.springframework.boot.reactor.netty.autoconfigure.NettyReactiveWebServerAutoConfiguration;
 import org.springframework.boot.test.context.assertj.AssertableReactiveWebApplicationContext;
 import org.springframework.boot.test.context.runner.ReactiveWebApplicationContextRunner;

spring-boot-project/spring-boot-reactor-netty/build.gradle

@@ -15,7 +15,7 @@ dependencies {
 
 	implementation(project(":spring-boot-project:spring-boot-netty"))
 
-	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
+	optional(project(":spring-boot-project:spring-boot-actuator-autoconfigure"))
 	optional(project(":spring-boot-project:spring-boot-autoconfigure"))
 
 	testImplementation(project(":spring-boot-project:spring-boot-test"))

spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/autoconfigure/web/server/reactive/netty/package-info.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.web.server.netty;
+package org.springframework.boot.reactor.netty.actuate.autoconfigure.web.server;
 
 import reactor.netty.http.server.HttpServer;
 

…ManagementChildContextConfiguration.java …ManagementChildContextConfiguration.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/netty/NettyReactiveManagementChildContextConfiguration.java renamed to spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/actuate/autoconfigure/web/server/NettyReactiveManagementChildContextConfiguration.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/netty/NettyReactiveManagementChildContextConfiguration.java renamed to spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/actuate/autoconfigure/web/server/NettyReactiveManagementChildContextConfiguration.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.actuate.autoconfigure.web.server.netty;
+package org.springframework.boot.reactor.netty.actuate.autoconfigure.web.server;
 
 import reactor.netty.http.server.HttpServer;
 
@@ -37,7 +37,7 @@
  * @since 4.0.0
  */
 @AutoConfiguration
-@ConditionalOnClass(HttpServer.class)
+@ConditionalOnClass({ HttpServer.class, ManagementContextFactory.class })
 @ConditionalOnWebApplication(type = Type.REACTIVE)
 @ConditionalOnManagementPort(ManagementPortType.DIFFERENT)
 public class NettyReactiveManagementContextAutoConfiguration {

…eManagementContextAutoConfiguration.java …eManagementContextAutoConfiguration.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/netty/NettyReactiveManagementContextAutoConfiguration.java renamed to spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/actuate/autoconfigure/web/server/NettyReactiveManagementContextAutoConfiguration.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/netty/NettyReactiveManagementContextAutoConfiguration.java renamed to spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/actuate/autoconfigure/web/server/NettyReactiveManagementContextAutoConfiguration.java

@@ -15,6 +15,6 @@
  */
 
 /**
- * Actuator Netty web server support.
+ * Auto-configuration for a Reactor Netty based management server.
  */
-package org.springframework.boot.actuate.autoconfigure.web.server.netty;
+package org.springframework.boot.reactor.netty.actuate.autoconfigure.web.server;

…igure/web/server/netty/package-info.java …toconfigure/web/server/package-info.javaspring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/netty/package-info.java renamed to spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/actuate/autoconfigure/web/server/package-info.java spring-boot-project/spring-boot-actuator-autoconfigure-all/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/netty/package-info.java renamed to spring-boot-project/spring-boot-reactor-netty/src/main/java/org/springframework/boot/reactor/netty/actuate/autoconfigure/web/server/package-info.java

@@ -0,0 +1 @@
+org.springframework.boot.reactor.netty.actuate.autoconfigure.web.server.NettyReactiveManagementChildContextConfiguration

spring-boot-project/spring-boot-reactor-netty/src/main/resources/META-INF/spring/org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration.imports

@@ -1 +1,2 @@
+org.springframework.boot.reactor.netty.actuate.autoconfigure.web.server.NettyReactiveManagementContextAutoConfiguration
 org.springframework.boot.reactor.netty.autoconfigure.NettyReactiveWebServerAutoConfiguration