Pull up setDisableMBeanRegistry

Issue: 44070

Author: wilkinsona

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/ConfigurableTomcatWebServerFactory.java

@@ -91,4 +91,11 @@ public interface ConfigurableTomcatWebServerFactory extends ConfigurableWebServe
 	 */
 	void setUseApr(boolean useApr);
 
+	/**
+	 * Set whether the factory should disable Tomcat's MBean registry prior to creating
+	 * the server.
+	 * @param disableMBeanRegistry whether to disable the MBean registry
+	 */
+	void setDisableMBeanRegistry(boolean disableMBeanRegistry);
+
 }

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/TomcatWebServerFactory.java

@@ -351,6 +351,7 @@ public boolean isDisableMBeanRegistry() {
 	 * the server.
 	 * @param disableMBeanRegistry whether to disable the MBean registry
 	 */
+	@Override
 	public void setDisableMBeanRegistry(boolean disableMBeanRegistry) {
 		this.disableMBeanRegistry = disableMBeanRegistry;
 	}

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/autoconfigure/TomcatWebServerFactoryCustomizer.java

@@ -152,6 +152,9 @@ public void customize(ConfigurableTomcatWebServerFactory factory) {
 			.as(this::joinCharacters)
 			.whenHasText()
 			.to((relaxedChars) -> customizeRelaxedQueryChars(factory, relaxedChars));
+		map.from(this.tomcatProperties.getMbeanregistry()::isEnabled)
+			.as((enable) -> !enable)
+			.to(factory::setDisableMBeanRegistry);
 		customizeStaticResources(factory);
 		customizeErrorReportValve(this.serverProperties.getError(), factory);
 		factory.setUseApr(getUseApr(this.tomcatProperties.getUseApr()));

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/reactive/autoconfigure/TomcatReactiveWebServerAutoConfiguration.java

@@ -51,12 +51,6 @@
 @Import({ TomcatWebServerConfiguration.class, ReactiveWebServerConfiguration.class })
 public class TomcatReactiveWebServerAutoConfiguration {
 
-	@Bean
-	TomcatReactiveWebServerFactoryCustomizer tomcatReactiveWebServerFactoryCustomizer(
-			TomcatServerProperties tomcatProperties) {
-		return new TomcatReactiveWebServerFactoryCustomizer(tomcatProperties);
-	}
-
 	@Bean
 	@ConditionalOnMissingBean(ReactiveWebServerFactory.class)
 	TomcatReactiveWebServerFactory tomcatReactiveWebServerFactory(

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/reactive/autoconfigure/TomcatReactiveWebServerFactoryCustomizer.java

@@ -53,7 +53,6 @@ public void customize(TomcatServletWebServerFactory factory) {
 			customizeRedirectContextRoot(factory, this.tomcatProperties.getRedirectContextRoot());
 		}
 		customizeUseRelativeRedirects(factory, this.tomcatProperties.isUseRelativeRedirects());
-		factory.setDisableMBeanRegistry(!this.tomcatProperties.getMbeanregistry().isEnabled());
 	}
 
 	private void customizeRedirectContextRoot(ConfigurableTomcatWebServerFactory factory, boolean redirectContextRoot) {

spring-boot-project/spring-boot-tomcat/src/main/java/org/springframework/boot/tomcat/servlet/autoconfigure/TomcatServletWebServerFactoryCustomizer.java

@@ -585,6 +585,15 @@ void configureExecutor() {
 		});
 	}
 
+	@Test
+	void enableMBeanRegistry() {
+		bind("server.tomcat.mbeanregistry.enabled=true");
+		TomcatServletWebServerFactory factory = new TomcatServletWebServerFactory(0);
+		assertThat(factory.isDisableMBeanRegistry()).isTrue();
+		this.customizer.customize(factory);
+		assertThat(factory.isDisableMBeanRegistry()).isFalse();
+	}
+
 	private void bind(String... inlinedProperties) {
 		TestPropertySourceUtils.addInlinedPropertiesToEnvironment(this.environment, inlinedProperties);
 		Binder binder = new Binder(ConfigurationPropertySources.get(this.environment));