Split WebEndpointTest infrastructure configuration

Author: snicoll

settings.gradle

@@ -46,7 +46,6 @@ include "spring-boot-project:spring-boot-actuator-autoconfigure"
 include "spring-boot-project:spring-boot-actuator-autoconfigure-all"
 include "spring-boot-project:spring-boot-actuator-docs"
 include "spring-boot-project:spring-boot-actuator-integration-tests"
-include "spring-boot-project:spring-boot-actuator-test-support"
 include "spring-boot-project:spring-boot-amqp"
 include "spring-boot-project:spring-boot-artemis"
 include "spring-boot-project:spring-boot-autoconfigure"

spring-boot-project/spring-boot-actuator-integration-tests/build.gradle

@@ -7,7 +7,6 @@ description = "Spring Boot Actuator Integration Tests"
 
 dependencies {
 	testImplementation(project(":spring-boot-project:spring-boot-actuator"))
-	testImplementation(project(":spring-boot-project:spring-boot-actuator-test-support"))
 	testImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
 	testImplementation(project(":spring-boot-project:spring-boot-http-converter"))
 	testImplementation(project(":spring-boot-project:spring-boot-jackson"))
@@ -20,6 +19,9 @@ dependencies {
 	testImplementation(project(":spring-boot-project:spring-boot-web-server"))
 	testImplementation(project(":spring-boot-project:spring-boot-webflux"))
 	testImplementation(project(":spring-boot-project:spring-boot-webmvc"))
+	testImplementation(testFixtures(project(":spring-boot-project:spring-boot-jersey")))
+	testImplementation(testFixtures(project(":spring-boot-project:spring-boot-webflux")))
+	testImplementation(testFixtures(project(":spring-boot-project:spring-boot-webmvc")))
 	testImplementation("io.micrometer:micrometer-registry-prometheus")
 	testImplementation("io.prometheus:prometheus-metrics-exposition-formats")
 	testImplementation("net.minidev:json-smart")

spring-boot-project/spring-boot-actuator-test-support/build.gradle

@@ -1,5 +1,6 @@
 plugins {
 	id "java-library"
+	id "java-test-fixtures"
 	id "org.springframework.boot.configuration-properties"
 	id "org.springframework.boot.optional-dependencies"
 	id "org.springframework.boot.deployed"
@@ -45,6 +46,10 @@ dependencies {
 	optional("org.springframework.security:spring-security-core")
 	optional("org.springframework.security:spring-security-web")
 
+	testFixturesApi("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
+	testFixturesImplementation("org.junit.jupiter:junit-jupiter-api")
+	testFixturesImplementation("org.springframework:spring-test")
+
 	testImplementation(project(":spring-boot-project:spring-boot-autoconfigure"))
 	testImplementation(project(":spring-boot-project:spring-boot-jackson"))
 	testImplementation(project(":spring-boot-project:spring-boot-jsonb"))

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

@@ -0,0 +1,46 @@
+/*
+ * 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.actuate.endpoint.web.test;
+
+import java.util.List;
+
+import org.springframework.boot.actuate.endpoint.web.test.WebEndpointTest.Infrastructure;
+
+/**
+ * Strategy interface to provide the web endpoint configuration for a target
+ * {@linkplain Infrastructure infrastructure}.
+ *
+ * @author Stephane Nicoll
+ * @since 4.0.0
+ */
+public interface WebEndpointInfrastructureProvider {
+
+	/**
+	 * Specify if the given {@link Infrastructure} is supported.
+	 * @param infrastructure the infrastructure to target
+	 * @return {@code true} if this instance can provide the configuration
+	 */
+	boolean supports(Infrastructure infrastructure);
+
+	/**
+	 * Return the configuration to use for the given {@code infrastructure}.
+	 * @param infrastructure the infrastructure to target
+	 * @return the configuration for that infrastructure
+	 */
+	List<Class<?>> getInfrastructureConfiguration(Infrastructure infrastructure);
+
+}

spring-boot-project/spring-boot-actuator/src/testFixtures/java/org/springframework/boot/actuate/endpoint/web/test/WebEndpointInfrastructureProvider.java

@@ -53,29 +53,27 @@ enum Infrastructure {
 		/**
 		 * Actuator running on the Jersey-based infrastructure.
 		 */
-		JERSEY("Jersey", WebEndpointTestInvocationContextProvider::createJerseyContext),
+		JERSEY("Jersey"),
 
 		/**
 		 * Actuator running on the WebMVC-based infrastructure.
 		 */
-		MVC("WebMvc", WebEndpointTestInvocationContextProvider::createWebMvcContext),
+		MVC("WebMvc"),
 
 		/**
 		 * Actuator running on the WebFlux-based infrastructure.
 		 */
-		WEBFLUX("WebFlux", WebEndpointTestInvocationContextProvider::createWebFluxContext);
+		WEBFLUX("WebFlux");
 
 		private final String name;
 
-		private final Function<List<Class<?>>, ConfigurableApplicationContext> contextFactory;
-
-		Infrastructure(String name, Function<List<Class<?>>, ConfigurableApplicationContext> contextFactory) {
+		Infrastructure(String name) {
 			this.name = name;
-			this.contextFactory = contextFactory;
 		}
 
-		WebEndpointsInvocationContext createInvocationContext() {
-			return new WebEndpointsInvocationContext(this.name, this.contextFactory);
+		WebEndpointsInvocationContext createInvocationContext(
+				Function<List<Class<?>>, ConfigurableApplicationContext> contextFactory) {
+			return new WebEndpointsInvocationContext(this.name, contextFactory);
 		}
 
 	}