Remove most deprecated APIs that were due for removal in 4.0

Support for rest controller, controler, and servlet endpoints has
been kept for now.

Issue: 45600

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnAvailableEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * 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.
@@ -34,9 +34,9 @@
  * endpoint is considered available if it is both enabled and exposed on the specified
  * technologies.
  * <p>
- * Matches enablement according to the endpoints specific {@link Environment} property,
- * falling back to {@code management.endpoints.enabled-by-default} or failing that
- * {@link Endpoint#enableByDefault()}.
+ * Matches access according to the endpoint's specific {@link Environment} property,
+ * falling back to {@code management.endpoints.default-access} or failing that
+ * {@link Endpoint#defaultAccess()}.
  * <p>
  * Matches exposure according to any of the {@code management.endpoints.web.exposure.<id>}
  * or {@code management.endpoints.jmx.exposure.<id>} specific properties or failing that

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/OnAvailableEndpointCondition.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * 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.
@@ -17,7 +17,6 @@
 package org.springframework.boot.actuate.autoconfigure.endpoint.condition;
 
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.EnumSet;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -126,8 +125,7 @@ private ConditionOutcome getMatchOutcome(ConditionContext context,
 	private ConditionOutcome getAccessOutcome(Environment environment, MergedAnnotation<Endpoint> endpointAnnotation,
 			EndpointId endpointId, ConditionMessage.Builder message) {
 		Access defaultAccess = endpointAnnotation.getEnum("defaultAccess", Access.class);
-		boolean enableByDefault = endpointAnnotation.getBoolean("enableByDefault");
-		Access access = getAccess(environment, endpointId, (enableByDefault) ? defaultAccess : Access.NONE);
+		Access access = getAccess(environment, endpointId, defaultAccess);
 		return new ConditionOutcome(access != Access.NONE,
 				message.because("the configured access for endpoint '%s' is %s".formatted(endpointId, access)));
 	}
@@ -153,17 +151,8 @@ private ConditionOutcome getExposureOutcome(ConditionContext context,
 
 	private Set<EndpointExposure> getExposures(MergedAnnotation<ConditionalOnAvailableEndpoint> conditionAnnotation) {
 		EndpointExposure[] exposures = conditionAnnotation.getEnumArray("exposure", EndpointExposure.class);
-		return replaceCloudFoundryExposure(
-				(exposures.length == 0) ? EnumSet.allOf(EndpointExposure.class) : Arrays.asList(exposures));
-	}
-
-	@SuppressWarnings("removal")
-	private Set<EndpointExposure> replaceCloudFoundryExposure(Collection<EndpointExposure> exposures) {
-		Set<EndpointExposure> result = EnumSet.copyOf(exposures);
-		if (result.remove(EndpointExposure.CLOUD_FOUNDRY)) {
-			result.add(EndpointExposure.WEB);
-		}
-		return result;
+		return (exposures.length == 0) ? EnumSet.allOf(EndpointExposure.class)
+				: EnumSet.copyOf(Arrays.asList(exposures));
 	}
 
 	private Set<EndpointExposureOutcomeContributor> getExposureOutcomeContributors(ConditionContext context) {

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/expose/EndpointExposure.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * 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.
@@ -32,16 +32,7 @@ public enum EndpointExposure {
 	/**
 	 * Exposed over a web endpoint.
 	 */
-	WEB("health"),
-
-	/**
-	 * Exposed on Cloud Foundry over `/cloudfoundryapplication`.
-	 * @since 2.6.4
-	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of using
-	 * {@link EndpointExposure#WEB}
-	 */
-	@Deprecated(since = "3.4.0", forRemoval = true)
-	CLOUD_FOUNDRY("*");
+	WEB("health");
 
 	private final String[] defaultIncludes;
 

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementWebServerFactoryCustomizer.java

@@ -46,15 +46,6 @@ public class ManagementWebServerFactoryCustomizer<T extends ConfigurableWebServe
 
 	private final Class<? extends WebServerFactoryCustomizer<?>>[] customizerClasses;
 
-	@SafeVarargs
-	@SuppressWarnings("varargs")
-	@Deprecated(since = "3.5.0", forRemoval = true)
-	protected ManagementWebServerFactoryCustomizer(ListableBeanFactory beanFactory,
-			Class<? extends WebServerFactoryCustomizer<?>>... customizerClasses) {
-		this.beanFactory = beanFactory;
-		this.customizerClasses = customizerClasses;
-	}
-
 	/**
 	 * Creates a new customizer that will retrieve beans using the given
 	 * {@code beanFactory}.

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/endpoint/condition/ConditionalOnAvailableEndpointTests.java

@@ -273,21 +273,6 @@ void whenBothDefaultAccessAndDefaultEnabledAreConfiguredThenThrows() {
 				.isInstanceOf(MutuallyExclusiveConfigurationPropertiesException.class));
 	}
 
-	@Test
-	void whenDisabledAndAccessibleByDefaultEndpointIsNotAvailable() {
-		this.contextRunner.withUserConfiguration(DisabledButAccessibleEndpointConfiguration.class)
-			.withPropertyValues("management.endpoints.web.exposure.include=*")
-			.run((context) -> assertThat(context).doesNotHaveBean(DisabledButAccessibleEndpoint.class));
-	}
-
-	@Test
-	void whenDisabledAndAccessibleByDefaultEndpointCanBeAvailable() {
-		this.contextRunner.withUserConfiguration(DisabledButAccessibleEndpointConfiguration.class)
-			.withPropertyValues("management.endpoints.web.exposure.include=*",
-					"management.endpoints.access.default=unrestricted")
-			.run((context) -> assertThat(context).hasSingleBean(DisabledButAccessibleEndpoint.class));
-	}
-
 	@Test
 	@WithTestEndpointOutcomeExposureContributor
 	void exposureOutcomeContributorCanMakeEndpointAvailable() {
@@ -325,12 +310,6 @@ static class DashedEndpoint {
 
 	}
 
-	@SuppressWarnings({ "deprecation", "removal" })
-	@Endpoint(id = "disabledbutaccessible", enableByDefault = false)
-	static class DisabledButAccessibleEndpoint {
-
-	}
-
 	@EndpointExtension(endpoint = SpringEndpoint.class, filter = TestFilter.class)
 	static class SpringEndpointExtension {
 
@@ -430,15 +409,4 @@ String unexposed() {
 
 	}
 
-	@Configuration(proxyBeanMethods = false)
-	static class DisabledButAccessibleEndpointConfiguration {
-
-		@Bean
-		@ConditionalOnAvailableEndpoint
-		DisabledButAccessibleEndpoint disabledButAccessible() {
-			return new DisabledButAccessibleEndpoint();
-		}
-
-	}
-
 }

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/AbstractExposableEndpoint.java

@@ -36,19 +36,6 @@ public abstract class AbstractExposableEndpoint<O extends Operation> implements
 
 	private final List<O> operations;
 
-	/**
-	 * Create a new {@link AbstractExposableEndpoint} instance.
-	 * @param id the endpoint id
-	 * @param enabledByDefault if the endpoint is enabled by default
-	 * @param operations the endpoint operations
-	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
-	 * {@link #AbstractExposableEndpoint(EndpointId, Access, Collection)}
-	 */
-	@Deprecated(since = "3.4.0", forRemoval = true)
-	public AbstractExposableEndpoint(EndpointId id, boolean enabledByDefault, Collection<? extends O> operations) {
-		this(id, (enabledByDefault) ? Access.UNRESTRICTED : Access.READ_ONLY, operations);
-	}
-
 	/**
 	 * Create a new {@link AbstractExposableEndpoint} instance.
 	 * @param id the endpoint id
@@ -69,13 +56,6 @@ public EndpointId getEndpointId() {
 		return this.id;
 	}
 
-	@Override
-	@SuppressWarnings("removal")
-	@Deprecated(since = "3.4.0", forRemoval = true)
-	public boolean isEnableByDefault() {
-		return this.defaultAccess != Access.NONE;
-	}
-
 	@Override
 	public Access getDefaultAccess() {
 		return this.defaultAccess;

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/ExposableEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * 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.
@@ -34,15 +34,6 @@ public interface ExposableEndpoint<O extends Operation> {
 	 */
 	EndpointId getEndpointId();
 
-	/**
-	 * Returns if the endpoint is enabled by default.
-	 * @return if the endpoint is enabled by default
-	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
-	 * {@link #getDefaultAccess()}
-	 */
-	@Deprecated(since = "3.4.0", forRemoval = true)
-	boolean isEnableByDefault();
-
 	/**
 	 * Returns the access to the endpoint that is permitted by default.
 	 * @return access that is permitted by default

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/AbstractDiscoveredEndpoint.java

@@ -41,23 +41,6 @@ public abstract class AbstractDiscoveredEndpoint<O extends Operation> extends Ab
 
 	private final Object endpointBean;
 
-	/**
-	 * Create a new {@link AbstractDiscoveredEndpoint} instance.
-	 * @param discoverer the discoverer that discovered the endpoint
-	 * @param endpointBean the primary source bean
-	 * @param id the ID of the endpoint
-	 * @param enabledByDefault if the endpoint is enabled by default
-	 * @param operations the endpoint operations
-	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
-	 * {@link #AbstractDiscoveredEndpoint(EndpointDiscoverer, Object, EndpointId, Access, Collection)}
-	 */
-	@SuppressWarnings("removal")
-	@Deprecated(since = "3.4.0", forRemoval = true)
-	public AbstractDiscoveredEndpoint(EndpointDiscoverer<?, ?> discoverer, Object endpointBean, EndpointId id,
-			boolean enabledByDefault, Collection<? extends O> operations) {
-		this(discoverer, endpointBean, id, (enabledByDefault) ? Access.UNRESTRICTED : Access.READ_ONLY, operations);
-	}
-
 	/**
 	 * Create a new {@link AbstractDiscoveredEndpoint} instance.
 	 * @param discoverer the discoverer that discovered the endpoint

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/Endpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2024 the original author or authors.
+ * 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.
@@ -63,14 +63,6 @@
 	 */
 	String id() default "";
 
-	/**
-	 * If the endpoint should be enabled or disabled by default.
-	 * @return {@code true} if the endpoint is enabled by default
-	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of {@link #defaultAccess()}
-	 */
-	@Deprecated(since = "3.4.0", forRemoval = true)
-	boolean enableByDefault() default true;
-
 	/**
 	 * Level of access to the endpoint that is permitted by default.
 	 * @return the default level of access

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/annotation/EndpointDiscoverer.java

@@ -84,21 +84,6 @@ public abstract class EndpointDiscoverer<E extends ExposableEndpoint<O>, O exten
 
 	private volatile Collection<E> endpoints;
 
-	/**
-	 * Create a new {@link EndpointDiscoverer} instance.
-	 * @param applicationContext the source application context
-	 * @param parameterValueMapper the parameter value mapper
-	 * @param invokerAdvisors invoker advisors to apply
-	 * @param endpointFilters endpoint filters to apply
-	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
-	 * {@link #EndpointDiscoverer(ApplicationContext, ParameterValueMapper, Collection, Collection, Collection)}
-	 */
-	@Deprecated(since = "3.4.0", forRemoval = true)
-	public EndpointDiscoverer(ApplicationContext applicationContext, ParameterValueMapper parameterValueMapper,
-			Collection<OperationInvokerAdvisor> invokerAdvisors, Collection<EndpointFilter<E>> endpointFilters) {
-		this(applicationContext, parameterValueMapper, invokerAdvisors, endpointFilters, Collections.emptyList());
-	}
-
 	/**
 	 * Create a new {@link EndpointDiscoverer} instance.
 	 * @param applicationContext the source application context
@@ -381,21 +366,6 @@ protected Class<? extends E> getEndpointType() {
 		return (Class<? extends E>) ResolvableType.forClass(EndpointDiscoverer.class, getClass()).resolveGeneric(0);
 	}
 
-	/**
-	 * Factory method called to create the {@link ExposableEndpoint endpoint}.
-	 * @param endpointBean the source endpoint bean
-	 * @param id the ID of the endpoint
-	 * @param enabledByDefault if the endpoint is enabled by default
-	 * @param operations the endpoint operations
-	 * @return a created endpoint (a {@link DiscoveredEndpoint} is recommended)
-	 * @deprecated since 3.4.0 for removal in 4.0.0 in favor of
-	 * {@link #createEndpoint(Object, EndpointId, Access, Collection)}
-	 */
-	@Deprecated(since = "3.4.0", forRemoval = true)
-	protected E createEndpoint(Object endpointBean, EndpointId id, boolean enabledByDefault, Collection<O> operations) {
-		return createEndpoint(endpointBean, id, (enabledByDefault) ? Access.UNRESTRICTED : Access.NONE, operations);
-	}
-
 	/**
 	 * Factory method called to create the {@link ExposableEndpoint endpoint}.
 	 * @param endpointBean the source endpoint bean
@@ -498,8 +468,7 @@ private static class EndpointBean {
 			this.beanType = beanType;
 			this.beanSupplier = beanSupplier;
 			this.id = EndpointId.of(environment, id);
-			boolean enabledByDefault = annotation.getBoolean("enableByDefault");
-			this.defaultAccess = enabledByDefault ? annotation.getEnum("defaultAccess", Access.class) : Access.NONE;
+			this.defaultAccess = annotation.getEnum("defaultAccess", Access.class);
 			this.filter = getFilter(beanType);
 		}