Move Jetty management server support to spring-boot-jetty

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyAccessLogCustomizer.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright 2012-2025 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
+ *
+ *      https://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.jetty.actuate.autoconfigure.web.server;
+
+import java.io.File;
+
+import org.eclipse.jetty.server.CustomRequestLog;
+import org.eclipse.jetty.server.RequestLog;
+import org.eclipse.jetty.server.RequestLogWriter;
+import org.eclipse.jetty.server.Server;
+
+import org.springframework.boot.actuate.autoconfigure.web.server.AccessLogCustomizer;
+import org.springframework.boot.jetty.ConfigurableJettyWebServerFactory;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.util.StringUtils;
+
+/**
+ * {@link AccessLogCustomizer} for Jetty.
+ *
+ * @author Andy Wilkinson
+ */
+class JettyAccessLogCustomizer extends AccessLogCustomizer<ConfigurableJettyWebServerFactory>
+		implements WebServerFactoryCustomizer<ConfigurableJettyWebServerFactory> {
+
+	JettyAccessLogCustomizer(JettyManagementServerProperties properties) {
+		super(properties.getAccesslog().getPrefix());
+	}
+
+	@Override
+	public void customize(ConfigurableJettyWebServerFactory factory) {
+		factory.addServerCustomizers(this::customizeServer);
+	}
+
+	private void customizeServer(Server server) {
+		RequestLog requestLog = server.getRequestLog();
+		if (requestLog instanceof CustomRequestLog customRequestLog) {
+			customizeRequestLog(customRequestLog);
+		}
+	}
+
+	private void customizeRequestLog(CustomRequestLog requestLog) {
+		if (requestLog.getWriter() instanceof RequestLogWriter requestLogWriter) {
+			customizeRequestLogWriter(requestLogWriter);
+		}
+	}
+
+	private void customizeRequestLogWriter(RequestLogWriter writer) {
+		String filename = writer.getFileName();
+		if (StringUtils.hasLength(filename)) {
+			File file = new File(filename);
+			file = new File(file.getParentFile(), customizePrefix(file.getName()));
+			writer.setFilename(file.getPath());
+		}
+	}
+
+}

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyManagementServerProperties.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright 2012-2025 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
+ *
+ *      https://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.jetty.actuate.autoconfigure.web.server;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Properties for a Jetty-based management server.
+ *
+ * @author Moritz Halbritter
+ * @since 4.0.0
+ */
+@ConfigurationProperties("management.server.jetty")
+public class JettyManagementServerProperties {
+
+	private final Accesslog accesslog = new Accesslog();
+
+	public Accesslog getAccesslog() {
+		return this.accesslog;
+	}
+
+	public static class Accesslog {
+
+		/**
+		 * Management log file name prefix.
+		 */
+		private String prefix = "management_";
+
+		public String getPrefix() {
+			return this.prefix;
+		}
+
+		public void setPrefix(String prefix) {
+			this.prefix = prefix;
+		}
+
+	}
+
+}

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyReactiveManagementChildContextConfiguration.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2012-2025 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
+ *
+ *      https://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.jetty.actuate.autoconfigure.web.server;
+
+import org.eclipse.jetty.server.Server;
+
+import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration;
+import org.springframework.boot.actuate.autoconfigure.web.ManagementContextType;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * {@link ManagementContextConfiguration @ManagementContextConfiguration} for Jetty-based
+ * reactive web endpoint infrastructure when a separate management context running on a
+ * different port is required.
+ *
+ * @author Andy Wilkinson
+ */
+@ConditionalOnClass(Server.class)
+@ConditionalOnWebApplication(type = Type.REACTIVE)
+@EnableConfigurationProperties(JettyManagementServerProperties.class)
+@ManagementContextConfiguration(value = ManagementContextType.CHILD, proxyBeanMethods = false)
+class JettyReactiveManagementChildContextConfiguration {
+
+	@Bean
+	JettyAccessLogCustomizer jettyManagementAccessLogCustomizer(JettyManagementServerProperties properties) {
+		return new JettyAccessLogCustomizer(properties);
+	}
+
+}

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyReactiveManagementContextAutoConfiguration.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2012-2025 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
+ *
+ *      https://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.jetty.actuate.autoconfigure.web.server;
+
+import org.eclipse.jetty.server.Server;
+
+import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory;
+import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort;
+import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
+import org.springframework.boot.jetty.autoconfigure.reactive.JettyReactiveWebServerAutoConfiguration;
+import org.springframework.boot.web.server.reactive.ReactiveWebServerFactory;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * Auto-configuration for a Jetty-based reactive management context.
+ *
+ * @author Andy Wilkinson
+ * @since 4.0.0
+ */
+@AutoConfiguration
+@ConditionalOnClass({ Server.class, ManagementContextFactory.class })
+@ConditionalOnWebApplication(type = Type.REACTIVE)
+@ConditionalOnManagementPort(ManagementPortType.DIFFERENT)
+public class JettyReactiveManagementContextAutoConfiguration {
+
+	@Bean
+	static ManagementContextFactory reactiveWebChildContextFactory() {
+		return new ManagementContextFactory(WebApplicationType.REACTIVE, ReactiveWebServerFactory.class,
+				JettyReactiveWebServerAutoConfiguration.class);
+	}
+
+}

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyServletManagementChildContextConfiguration.java

@@ -0,0 +1,47 @@
+/*
+ * Copyright 2012-2025 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
+ *
+ *      https://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.jetty.actuate.autoconfigure.web.server;
+
+import org.eclipse.jetty.server.Server;
+
+import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration;
+import org.springframework.boot.actuate.autoconfigure.web.ManagementContextType;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * {@link ManagementContextConfiguration @ManagementContextConfiguration} for Jetty-based
+ * servlet web endpoint infrastructure when a separate management context running on a
+ * different port is required.
+ *
+ * @author Andy Wilkinson
+ */
+@ConditionalOnClass(Server.class)
+@ConditionalOnWebApplication(type = Type.SERVLET)
+@EnableConfigurationProperties(JettyManagementServerProperties.class)
+@ManagementContextConfiguration(value = ManagementContextType.CHILD, proxyBeanMethods = false)
+class JettyServletManagementChildContextConfiguration {
+
+	@Bean
+	JettyAccessLogCustomizer jettyManagementAccessLogCustomizer(JettyManagementServerProperties properties) {
+		return new JettyAccessLogCustomizer(properties);
+	}
+
+}

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyServletManagementContextAutoConfiguration.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright 2012-2025 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
+ *
+ *      https://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.jetty.actuate.autoconfigure.web.server;
+
+import org.eclipse.jetty.server.Server;
+
+import org.springframework.boot.WebApplicationType;
+import org.springframework.boot.actuate.autoconfigure.web.ManagementContextFactory;
+import org.springframework.boot.actuate.autoconfigure.web.server.ConditionalOnManagementPort;
+import org.springframework.boot.actuate.autoconfigure.web.server.ManagementPortType;
+import org.springframework.boot.autoconfigure.AutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
+import org.springframework.boot.jetty.autoconfigure.servlet.JettyServletWebServerAutoConfiguration;
+import org.springframework.boot.web.server.servlet.ServletWebServerFactory;
+import org.springframework.context.annotation.Bean;
+
+/**
+ * Auto-configuration for a Jetty-based servlet management context.
+ *
+ * @author Andy Wilkinson
+ * @since 4.0.0
+ */
+@AutoConfiguration
+@ConditionalOnClass({ Server.class, ManagementContextFactory.class })
+@ConditionalOnWebApplication(type = Type.SERVLET)
+@ConditionalOnManagementPort(ManagementPortType.DIFFERENT)
+public class JettyServletManagementContextAutoConfiguration {
+
+	@Bean
+	static ManagementContextFactory servletWebChildContextFactory() {
+		return new ManagementContextFactory(WebApplicationType.SERVLET, ServletWebServerFactory.class,
+				JettyServletWebServerAutoConfiguration.class);
+	}
+
+}

spring-boot-project/spring-boot-jetty/src/main/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/package-info.java

@@ -0,0 +1,20 @@
+/*
+ * Copyright 2012-2025 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
+ *
+ *      https://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.
+ */
+
+/**
+ * Auto-configuration for a Jetty-based management server.
+ */
+package org.springframework.boot.jetty.actuate.autoconfigure.web.server;

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

@@ -0,0 +1,2 @@
+org.springframework.boot.jetty.actuate.autoconfigure.web.server.JettyReactiveManagementChildContextConfiguration
+org.springframework.boot.jetty.actuate.autoconfigure.web.server.JettyServletManagementChildContextConfiguration

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

@@ -1,3 +1,5 @@
+org.springframework.boot.jetty.actuate.autoconfigure.web.server.JettyReactiveManagementContextAutoConfiguration
+org.springframework.boot.jetty.actuate.autoconfigure.web.server.JettyServletManagementContextAutoConfiguration
 org.springframework.boot.jetty.actuate.metrics.autoconfigure.JettyMetricsAutoConfiguration
 org.springframework.boot.jetty.autoconfigure.reactive.JettyReactiveWebServerAutoConfiguration
 org.springframework.boot.jetty.autoconfigure.servlet.JettyServletWebServerAutoConfiguration

spring-boot-project/spring-boot-jetty/src/test/java/org/springframework/boot/jetty/actuate/autoconfigure/web/server/JettyManagementServerPropertiesTests.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright 2012-2025 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
+ *
+ *      https://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.jetty.actuate.autoconfigure.web.server;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link JettyManagementServerProperties}.
+ *
+ * @author Andy Wilkinson
+ */
+class JettyManagementServerPropertiesTests {
+
+	@Test
+	void accessLogsArePrefixedByDefault() {
+		JettyManagementServerProperties properties = new JettyManagementServerProperties();
+		assertThat(properties.getAccesslog().getPrefix()).isEqualTo("management_");
+	}
+
+}