Register config classes once in reactive child context

Fixes gh-10939

Author: mbhave

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextFactory.java

@@ -17,6 +17,9 @@
 package org.springframework.boot.actuate.autoconfigure.web.reactive;
 
 import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 import org.springframework.beans.FatalBeanException;
 import org.springframework.beans.factory.NoSuchBeanDefinitionException;
@@ -42,8 +45,9 @@ public ConfigurableApplicationContext createManagementContext(
 			ApplicationContext parent, Class<?>... configClasses) {
 		AnnotationConfigReactiveWebServerApplicationContext child = new AnnotationConfigReactiveWebServerApplicationContext();
 		child.setParent(parent);
-		child.register(configClasses);
-		child.register(ReactiveWebServerAutoConfiguration.class);
+		List<Class<?>> combinedClasses = new ArrayList<>(Arrays.asList(configClasses));
+		combinedClasses.add(ReactiveWebServerAutoConfiguration.class);
+		child.register(combinedClasses.toArray(new Class<?>[combinedClasses.size()]));
 		registerReactiveWebServerFactory(parent, child);
 		return child;
 	}

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/reactive/ReactiveManagementContextFactoryTests.java

@@ -0,0 +1,85 @@
+/*
+ * Copyright 2012-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.boot.actuate.autoconfigure.web.reactive;
+
+import org.junit.Test;
+
+import org.springframework.boot.autoconfigure.web.reactive.ReactiveWebServerAutoConfiguration;
+import org.springframework.boot.web.reactive.context.AnnotationConfigReactiveWebServerApplicationContext;
+import org.springframework.boot.web.reactive.server.ReactiveWebServerFactory;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.server.reactive.HttpHandler;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.Mockito.mock;
+
+/**
+ * Tests for {@link ReactiveManagementContextFactory}.
+ *
+ * @author Madhura Bhave
+ */
+public class ReactiveManagementContextFactoryTests {
+
+	private ReactiveManagementContextFactory factory = new ReactiveManagementContextFactory();
+
+	private AnnotationConfigReactiveWebServerApplicationContext parent = new AnnotationConfigReactiveWebServerApplicationContext();
+
+	@Test
+	public void createManagementContextShouldCreateChildContextWithConfigClasses() throws Exception {
+		this.parent.register(ParentConfiguration.class);
+		this.parent.refresh();
+		AnnotationConfigReactiveWebServerApplicationContext childContext = (AnnotationConfigReactiveWebServerApplicationContext) this.factory.createManagementContext(this.parent,
+				TestConfiguration1.class, TestConfiguration2.class);
+		childContext.refresh();
+		assertThat(childContext.getBean(TestConfiguration1.class)).isNotNull();
+		assertThat(childContext.getBean(TestConfiguration2.class)).isNotNull();
+		assertThat(childContext.getBean(ReactiveWebServerAutoConfiguration.class)).isNotNull();
+	}
+
+	@Configuration
+	static class ParentConfiguration {
+
+		@Bean
+		public ReactiveWebServerFactory reactiveWebServerFactory() {
+			return mock(ReactiveWebServerFactory.class);
+		}
+
+		@Bean
+		public HttpHandler httpHandler(ApplicationContext applicationContext) {
+			return mock(HttpHandler.class);
+		}
+
+	}
+
+	@Configuration
+	static class TestConfiguration1 {
+
+		@Bean
+		public HttpHandler httpHandler(ApplicationContext applicationContext) {
+			return mock(HttpHandler.class);
+		}
+
+	}
+
+	@Configuration
+	static class TestConfiguration2 {
+
+	}
+
+}