Revert Support pluggable types for EndpointJsonMapper

Closes gh-46534

Author: philwebb

module/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jackson/JacksonEndpointAutoConfiguration.java

@@ -16,9 +16,6 @@
 
 package org.springframework.boot.actuate.autoconfigure.endpoint.jackson;
 
-import java.util.HashSet;
-import java.util.Set;
-
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import tools.jackson.databind.ObjectMapper;
 import tools.jackson.databind.json.JsonMapper;
@@ -29,7 +26,6 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
-import org.springframework.util.ClassUtils;
 
 /**
  * {@link EnableAutoConfiguration Auto-configuration} for Endpoint Jackson support.
@@ -40,8 +36,6 @@
 @AutoConfiguration
 public final class JacksonEndpointAutoConfiguration {
 
-	private static final String CONTRIBUTED_HEALTH = "org.springframework.boot.health.contributor.ContributedHealth";
-
 	@Bean
 	@ConditionalOnBooleanProperty(name = "management.endpoints.jackson.isolated-object-mapper", matchIfMissing = true)
 	@ConditionalOnClass(ObjectMapper.class)
@@ -50,24 +44,7 @@ EndpointJsonMapper endpointJsonMapper() {
 			.changeDefaultPropertyInclusion(
 					(value) -> value.withValueInclusion(Include.NON_NULL).withContentInclusion(Include.NON_NULL))
 			.build();
-		Set<Class<?>> supportedTypes = new HashSet<>(EndpointJsonMapper.DEFAULT_SUPPORTED_TYPES);
-		if (ClassUtils.isPresent(CONTRIBUTED_HEALTH, null)) {
-			supportedTypes.add(ClassUtils.resolveClassName(CONTRIBUTED_HEALTH, null));
-		}
-		return new EndpointJsonMapper() {
-
-			@Override
-			public JsonMapper get() {
-				return jsonMapper;
-			}
-
-			@Override
-			public Set<Class<?>> getSupportedTypes() {
-				return supportedTypes;
-			}
-
-		};
-
+		return () -> jsonMapper;
 	}
 
 }

module/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/jackson/EndpointJsonMapper.java

@@ -16,8 +16,6 @@
 
 package org.springframework.boot.actuate.endpoint.jackson;
 
-import java.util.Set;
-
 import tools.jackson.databind.json.JsonMapper;
 
 import org.springframework.boot.actuate.endpoint.OperationResponseBody;
@@ -30,26 +28,14 @@
  * @since 4.0.0
  * @see OperationResponseBody
  */
+@FunctionalInterface
 public interface EndpointJsonMapper {
 
-	/**
-	 * The default supported types.
-	 */
-	Set<Class<?>> DEFAULT_SUPPORTED_TYPES = Set.of(OperationResponseBody.class);
-
 	/**
 	 * Return the {@link JsonMapper} that should be used to serialize
 	 * {@link OperationResponseBody} endpoint results.
 	 * @return the object mapper
 	 */
 	JsonMapper get();
 
-	/**
-	 * Return the types that this endpoint mapper supports.
-	 * @return the supported types
-	 */
-	default Set<Class<?>> getSupportedTypes() {
-		return DEFAULT_SUPPORTED_TYPES;
-	}
-
 }

module/spring-boot-webflux/src/main/java/org/springframework/boot/webflux/autoconfigure/actuate/web/WebFluxEndpointManagementContextConfiguration.java

@@ -21,7 +21,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 import java.util.function.Supplier;
 
 import tools.jackson.databind.json.JsonMapper;
@@ -68,7 +67,6 @@
 import org.springframework.http.codec.ServerCodecConfigurer;
 import org.springframework.http.codec.json.JacksonJsonEncoder;
 import org.springframework.http.server.reactive.HttpHandler;
-import org.springframework.util.MimeType;
 import org.springframework.util.StringUtils;
 import org.springframework.util.function.SingletonSupplier;
 import org.springframework.web.reactive.DispatcherHandler;
@@ -184,17 +182,13 @@ private void process(ServerCodecConfigurer configurer) {
 
 		private void process(Encoder<?> encoder) {
 			if (encoder instanceof JacksonJsonEncoder jacksonJsonEncoder) {
-				this.endpointJsonMapper.get()
-					.getSupportedTypes()
-					.forEach((type) -> jacksonJsonEncoder.registerMappersForType(type, this::registerForAllMimeTypes));
+				jacksonJsonEncoder.registerMappersForType(OperationResponseBody.class, (associations) -> {
+					JsonMapper jsonMapper = this.endpointJsonMapper.get().get();
+					MEDIA_TYPES.forEach((mimeType) -> associations.put(mimeType, jsonMapper));
+				});
 			}
 		}
 
-		private void registerForAllMimeTypes(Map<MimeType, JsonMapper> registrar) {
-			JsonMapper jsonMapper = this.endpointJsonMapper.get().get();
-			MEDIA_TYPES.forEach((mimeType) -> registrar.put(mimeType, jsonMapper));
-		}
-
 	}
 
 }

module/spring-boot-webmvc/src/main/java/org/springframework/boot/webmvc/autoconfigure/actuate/web/WebMvcEndpointManagementContextConfiguration.java

@@ -21,7 +21,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 import tools.jackson.databind.json.JsonMapper;
 
@@ -183,13 +182,10 @@ public void configureMessageConverters(ServerBuilder builder) {
 		}
 
 		private void configure(JacksonJsonHttpMessageConverter converter) {
-			this.endpointJsonMapper.getSupportedTypes()
-				.forEach((type) -> converter.registerMappersForType(type, this::registerForAllMimeTypes));
-		}
-
-		private void registerForAllMimeTypes(Map<MediaType, JsonMapper> registrar) {
-			JsonMapper jsonMapper = this.endpointJsonMapper.get();
-			MEDIA_TYPES.forEach((mimeType) -> registrar.put(mimeType, jsonMapper));
+			converter.registerMappersForType(OperationResponseBody.class, (associations) -> {
+				JsonMapper jsonMapper = this.endpointJsonMapper.get();
+				MEDIA_TYPES.forEach((mimeType) -> associations.put(mimeType, jsonMapper));
+			});
 		}
 
 	}