Merge pull request #11773 from htynkn:chore/apply-property-mapper-to-webServerFactoryCustomizer

* pr/11773:
  Polish "Use PropertyMapper to configure WebServerFactory"
  Use PropertyMapper to configure WebServerFactory

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/DefaultReactiveWebServerFactoryCustomizer.java

@@ -20,6 +20,7 @@ import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.autoconfigure.web.embedded.jetty.JettyCustomizer;
 import org.springframework.boot.autoconfigure.web.embedded.tomcat.TomcatCustomizer;
 import org.springframework.boot.autoconfigure.web.embedded.undertow.UndertowCustomizer;
+import org.springframework.boot.context.properties.PropertyMapper;
 import org.springframework.boot.web.embedded.jetty.JettyReactiveWebServerFactory;
 import org.springframework.boot.web.embedded.tomcat.TomcatReactiveWebServerFactory;
 import org.springframework.boot.web.embedded.undertow.UndertowReactiveWebServerFactory;
@@ -33,6 +34,7 @@ import org.springframework.core.env.Environment;
  * Default {@link WebServerFactoryCustomizer} for reactive servers.
  *
  * @author Brian Clozel
+ * @author Yunkun Huang
  * @since 2.0.0
  */
 public class DefaultReactiveWebServerFactoryCustomizer
@@ -59,33 +61,21 @@ public class DefaultReactiveWebServerFactoryCustomizer
 
 	@Override
 	public void customize(ConfigurableReactiveWebServerFactory factory) {
-		if (this.serverProperties.getPort() != null) {
+		PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
-			factory.setPort(this.serverProperties.getPort());
+		map.from(this.serverProperties::getPort).to(factory::setPort);
-		}
+		map.from(this.serverProperties::getAddress).to(factory::setAddress);
-		if (this.serverProperties.getAddress() != null) {
+		map.from(this.serverProperties::getSsl).to(factory::setSsl);
-			factory.setAddress(this.serverProperties.getAddress());
+		map.from(this.serverProperties::getCompression).to(factory::setCompression);
-		}
+		map.from(this.serverProperties::getHttp2).to(factory::setHttp2);
-		if (this.serverProperties.getSsl() != null) {
+		map.from(() -> factory).whenInstanceOf(TomcatReactiveWebServerFactory.class)
-			factory.setSsl(this.serverProperties.getSsl());
+				.to(tomcatFactory -> TomcatCustomizer.customizeTomcat(
-		}
+						this.serverProperties, this.environment, tomcatFactory));
-		if (this.serverProperties.getCompression() != null) {
+		map.from(() -> factory).whenInstanceOf(JettyReactiveWebServerFactory.class)
-			factory.setCompression(this.serverProperties.getCompression());
+				.to(jettyFactory -> JettyCustomizer.customizeJetty(this.serverProperties,
-		}
+						this.environment, jettyFactory));
-		if (this.serverProperties.getHttp2() != null) {
+		map.from(() -> factory).whenInstanceOf(UndertowReactiveWebServerFactory.class)
-			factory.setHttp2(this.serverProperties.getHttp2());
+				.to(undertowFactory -> UndertowCustomizer.customizeUndertow(
-		}
+						this.serverProperties, this.environment, undertowFactory));
-		if (factory instanceof TomcatReactiveWebServerFactory) {
-			TomcatCustomizer.customizeTomcat(this.serverProperties, this.environment,
-					(TomcatReactiveWebServerFactory) factory);
-		}
-		if (factory instanceof JettyReactiveWebServerFactory) {
-			JettyCustomizer.customizeJetty(this.serverProperties, this.environment,
-					(JettyReactiveWebServerFactory) factory);
-		}
-		if (factory instanceof UndertowReactiveWebServerFactory) {
-			UndertowCustomizer.customizeUndertow(this.serverProperties, this.environment,
-					(UndertowReactiveWebServerFactory) factory);
-		}
 	}
 
 }

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/DefaultServletWebServerFactoryCustomizer.java

@@ -20,6 +20,7 @@ import org.springframework.boot.autoconfigure.web.ServerProperties;
 import org.springframework.boot.autoconfigure.web.embedded.jetty.JettyCustomizer;
 import org.springframework.boot.autoconfigure.web.embedded.tomcat.TomcatCustomizer;
 import org.springframework.boot.autoconfigure.web.embedded.undertow.UndertowCustomizer;
+import org.springframework.boot.context.properties.PropertyMapper;
 import org.springframework.boot.web.embedded.jetty.JettyServletWebServerFactory;
 import org.springframework.boot.web.embedded.tomcat.ConfigurableTomcatWebServerFactory;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
@@ -37,6 +38,7 @@ import org.springframework.util.ObjectUtils;
  * @author Brian Clozel
  * @author Stephane Nicoll
  * @author Olivier Lamy
+ * @author Yunkun Huang
  * @since 2.0.0
  */
 public class DefaultServletWebServerFactoryCustomizer
@@ -67,49 +69,34 @@ public class DefaultServletWebServerFactoryCustomizer
 
 	@Override
 	public void customize(ConfigurableServletWebServerFactory factory) {
-		if (this.serverProperties.getPort() != null) {
+		PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();
-			factory.setPort(this.serverProperties.getPort());
+		map.from(this.serverProperties::getPort).to(factory::setPort);
-		}
+		map.from(this.serverProperties::getAddress).to(factory::setAddress);
-		if (this.serverProperties.getAddress() != null) {
+		map.from(this.serverProperties.getServlet()::getContextPath)
-			factory.setAddress(this.serverProperties.getAddress());
+				.to(factory::setContextPath);
-		}
+		map.from(this.serverProperties::getDisplayName).to(factory::setDisplayName);
-		if (this.serverProperties.getServlet().getContextPath() != null) {
+		map.from(this.serverProperties.getServlet()::getSession).to(factory::setSession);
-			factory.setContextPath(this.serverProperties.getServlet().getContextPath());
+		map.from(this.serverProperties::getSsl).to(factory::setSsl);
-		}
+		map.from(this.serverProperties::getServlet).as(ServerProperties.Servlet::getJsp)
-		if (this.serverProperties.getDisplayName() != null) {
+				.to(factory::setJsp);
-			factory.setDisplayName(this.serverProperties.getDisplayName());
+		map.from(this.serverProperties::getCompression).to(factory::setCompression);
-		}
+		map.from(this.serverProperties::getHttp2).to(factory::setHttp2);
-		factory.setSession(this.serverProperties.getServlet().getSession());
+		map.from(this.serverProperties::getServerHeader).to(factory::setServerHeader);
-		if (this.serverProperties.getSsl() != null) {
+		map.from(() -> factory).whenInstanceOf(TomcatServletWebServerFactory.class)
-			factory.setSsl(this.serverProperties.getSsl());
+				.to(tomcatFactory -> {
-		}
+					TomcatCustomizer.customizeTomcat(this.serverProperties,
-		if (this.serverProperties.getServlet() != null) {
+							this.environment, tomcatFactory);
-			factory.setJsp(this.serverProperties.getServlet().getJsp());
+					TomcatServletCustomizer.customizeTomcat(this.serverProperties,
-		}
+							this.environment, tomcatFactory);
-		if (this.serverProperties.getCompression() != null) {
+				});
-			factory.setCompression(this.serverProperties.getCompression());
+		map.from(() -> factory).whenInstanceOf(JettyServletWebServerFactory.class)
-		}
+				.to(jettyFactory -> JettyCustomizer.customizeJetty(this.serverProperties,
-		if (this.serverProperties.getHttp2() != null) {
+						this.environment, jettyFactory));
-			factory.setHttp2(this.serverProperties.getHttp2());
+		map.from(() -> factory).whenInstanceOf(UndertowServletWebServerFactory.class)
-		}
+				.to(undertowFactory -> UndertowCustomizer.customizeUndertow(
-		factory.setServerHeader(this.serverProperties.getServerHeader());
+						this.serverProperties, this.environment, undertowFactory));
-		if (factory instanceof TomcatServletWebServerFactory) {
+		map.from(this.serverProperties.getServlet()::getContextParameters)
-			TomcatServletWebServerFactory tomcatFactory = (TomcatServletWebServerFactory) factory;
+				.to(factory::setInitParameters);
-			TomcatCustomizer.customizeTomcat(this.serverProperties, this.environment,
-					tomcatFactory);
-			TomcatServletCustomizer.customizeTomcat(this.serverProperties,
-					this.environment, tomcatFactory);
-		}
-		if (factory instanceof JettyServletWebServerFactory) {
-			JettyCustomizer.customizeJetty(this.serverProperties, this.environment,
-					(JettyServletWebServerFactory) factory);
-		}
-		if (factory instanceof UndertowServletWebServerFactory) {
-			UndertowCustomizer.customizeUndertow(this.serverProperties, this.environment,
-					(UndertowServletWebServerFactory) factory);
-		}
-		factory.setInitParameters(
-				this.serverProperties.getServlet().getContextParameters());
 	}
 
 	private static class TomcatServletCustomizer {

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/reactive/DefaultReactiveWebServerFactoryCustomizerTests.java

@@ -46,6 +46,7 @@ import org.springframework.boot.web.embedded.tomcat.TomcatReactiveWebServerFacto
 import org.springframework.boot.web.embedded.tomcat.TomcatWebServer;
 import org.springframework.boot.web.embedded.undertow.UndertowReactiveWebServerFactory;
 import org.springframework.boot.web.reactive.server.ConfigurableReactiveWebServerFactory;
+import org.springframework.boot.web.server.Ssl;
 import org.springframework.http.server.reactive.HttpHandler;
 import org.springframework.mock.env.MockEnvironment;
 
@@ -60,6 +61,7 @@ import static org.mockito.Mockito.verify;
  * Tests for {@link DefaultReactiveWebServerFactoryCustomizer}.
  *
  * @author Brian Clozel
+ * @author Yunkun Huang
  */
 public class DefaultReactiveWebServerFactoryCustomizerTests {
 
@@ -91,6 +93,16 @@ public class DefaultReactiveWebServerFactoryCustomizerTests {
 		verify(factory).setAddress(address);
 	}
 
+	@Test
+	public void testCustomizeServerSsl() {
+		ConfigurableReactiveWebServerFactory factory = mock(
+				ConfigurableReactiveWebServerFactory.class);
+		Ssl ssl = mock(Ssl.class);
+		this.properties.setSsl(ssl);
+		this.customizer.customize(factory);
+		verify(factory).setSsl(ssl);
+	}
+
 	@Test
 	public void tomcatAccessLogIsDisabledByDefault() {
 		TomcatReactiveWebServerFactory factory = new TomcatReactiveWebServerFactory();

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/DefaultServletWebServerFactoryCustomizerTests.java

@@ -49,13 +49,16 @@ import org.springframework.boot.web.embedded.tomcat.TomcatContextCustomizer;
 import org.springframework.boot.web.embedded.tomcat.TomcatServletWebServerFactory;
 import org.springframework.boot.web.embedded.tomcat.TomcatWebServer;
 import org.springframework.boot.web.embedded.undertow.UndertowServletWebServerFactory;
+import org.springframework.boot.web.server.Ssl;
 import org.springframework.boot.web.servlet.ServletContextInitializer;
 import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
+import org.springframework.boot.web.servlet.server.Jsp;
 import org.springframework.boot.web.servlet.server.Session;
 import org.springframework.boot.web.servlet.server.Session.Cookie;
 import org.springframework.mock.env.MockEnvironment;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
@@ -66,6 +69,7 @@ import static org.mockito.Mockito.verify;
  * Tests for {@link DefaultServletWebServerFactoryCustomizer}.
  *
  * @author Brian Clozel
+ * @author Yunkun Huang
  */
 public class DefaultServletWebServerFactoryCustomizerTests {
 
@@ -203,6 +207,24 @@ public class DefaultServletWebServerFactoryCustomizerTests {
 		verify(factory).setDisplayName("TestName");
 	}
 
+	@Test
+	public void testCustomizeSsl() {
+		ConfigurableServletWebServerFactory factory = mock(
+				ConfigurableServletWebServerFactory.class);
+		Ssl ssl = mock(Ssl.class);
+		this.properties.setSsl(ssl);
+		this.customizer.customize(factory);
+		verify(factory).setSsl(ssl);
+	}
+
+	@Test
+	public void testCustomizeJsp() {
+		ConfigurableServletWebServerFactory factory = mock(
+				ConfigurableServletWebServerFactory.class);
+		this.customizer.customize(factory);
+		verify(factory).setJsp(any(Jsp.class));
+	}
+
 	@Test
 	public void customizeSessionProperties() throws Exception {
 		Map<String, String> map = new HashMap<>();