Remove code deprecated for removal in 2.x

Closes gh-29482

Author: wilkinsona

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/OnEndpointElementCondition.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -78,18 +78,6 @@ protected ConditionOutcome getEndpointOutcome(ConditionContext context, String e
 	 * @since 2.6.0
 	 */
 	protected ConditionOutcome getDefaultOutcome(ConditionContext context, AnnotationAttributes annotationAttributes) {
-		return getDefaultEndpointsOutcome(context);
-	}
-
-	/**
-	 * Return the default outcome that should be used.
-	 * @param context the condition context
-	 * @return the default outcome
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
-	 * {@link #getDefaultOutcome(ConditionContext, AnnotationAttributes)}
-	 */
-	@Deprecated
-	protected ConditionOutcome getDefaultEndpointsOutcome(ConditionContext context) {
 		boolean match = Boolean
 				.parseBoolean(context.getEnvironment().getProperty(this.prefix + "defaults.enabled", "true"));
 		return new ConditionOutcome(match, ConditionMessage.forCondition(this.annotationType)

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -50,23 +50,6 @@ public class IncludeExcludeEndpointFilter<E extends ExposableEndpoint<?>> implem
 
 	private final EndpointPatterns exclude;
 
-	/**
-	 * Create a new {@link IncludeExcludeEndpointFilter} with include/exclude rules bound
-	 * from the {@link Environment}.
-	 * @param endpointType the endpoint type that should be considered (other types always
-	 * match)
-	 * @param environment the environment containing the properties
-	 * @param prefix the property prefix to bind
-	 * @param defaultIncludes the default {@code includes} to use when none are specified.
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
-	 * {@link #IncludeExcludeEndpointFilter(Class, Environment, String, String[])}
-	 */
-	@Deprecated
-	public IncludeExcludeEndpointFilter(Class<E> endpointType, Environment environment, String prefix,
-			DefaultIncludes defaultIncludes) {
-		this(endpointType, environment, prefix, DefaultIncludes.patterns(defaultIncludes));
-	}
-
 	/**
 	 * Create a new {@link IncludeExcludeEndpointFilter} with include/exclude rules bound
 	 * from the {@link Environment}.
@@ -95,23 +78,6 @@ public IncludeExcludeEndpointFilter(Class<E> endpointType, Collection<String> in
 		this(endpointType, include, exclude, new EndpointPatterns(defaultIncludes));
 	}
 
-	/**
-	 * Create a new {@link IncludeExcludeEndpointFilter} with specific include/exclude
-	 * rules.
-	 * @param endpointType the endpoint type that should be considered (other types always
-	 * match)
-	 * @param include the include patterns
-	 * @param exclude the exclude patterns
-	 * @param defaultIncludes the default {@code includes} to use when none are specified.
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
-	 * {@link #IncludeExcludeEndpointFilter(Class, Environment, String, String[])}
-	 */
-	@Deprecated
-	public IncludeExcludeEndpointFilter(Class<E> endpointType, Collection<String> include, Collection<String> exclude,
-			DefaultIncludes defaultIncludes) {
-		this(endpointType, include, exclude, DefaultIncludes.patterns(defaultIncludes));
-	}
-
 	private IncludeExcludeEndpointFilter(Class<E> endpointType, Environment environment, String prefix,
 			EndpointPatterns defaultIncludes) {
 		Assert.notNull(endpointType, "EndpointType must not be null");
@@ -172,35 +138,6 @@ private boolean isExcluded(EndpointId endpointId) {
 		return this.exclude.matches(endpointId);
 	}
 
-	/**
-	 * Default include patterns that can be used.
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of {@link EndpointExposure}.
-	 */
-	@Deprecated
-	public enum DefaultIncludes {
-
-		/**
-		 * The default set of include patterns used for JMX.
-		 */
-		JMX("*"),
-
-		/**
-		 * The default set of include patterns used for web.
-		 */
-		WEB("health");
-
-		private final EndpointPatterns patterns;
-
-		DefaultIncludes(String... patterns) {
-			this.patterns = new EndpointPatterns(patterns);
-		}
-
-		static EndpointPatterns patterns(DefaultIncludes defaultIncludes) {
-			return (defaultIncludes != null) ? defaultIncludes.patterns : (EndpointPatterns) null;
-		}
-
-	}
-
 	/**
 	 * A set of endpoint patterns used to match IDs.
 	 */
@@ -241,10 +178,6 @@ boolean matches(EndpointId endpointId) {
 			return this.matchesAll || this.endpointIds.contains(endpointId);
 		}
 
-		static EndpointPatterns forExposure(EndpointExposure exposure) {
-			return (exposure != null) ? new EndpointPatterns(exposure.getDefaultIncludes()) : null;
-		}
-
 	}
 
 }

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -159,24 +159,10 @@ private ObjectMapper getObjectMapper() {
 			JsonMapper.Builder builder = JsonMapper.builder();
 			configureJsonMapper(builder);
 			this.objectMapper = builder.build();
-			configureObjectMapper(this.objectMapper);
 		}
 		return this.objectMapper;
 	}
 
-	/**
-	 * Configure Jackson's {@link ObjectMapper} to be used to serialize the
-	 * {@link ConfigurationProperties @ConfigurationProperties} objects into a {@link Map}
-	 * structure.
-	 * @param mapper the object mapper
-	 * @deprecated since 2.6 for removal in 2.8 in favor of
-	 * {@link #configureJsonMapper(com.fasterxml.jackson.databind.json.JsonMapper.Builder)}
-	 */
-	@Deprecated
-	protected void configureObjectMapper(ObjectMapper mapper) {
-
-	}
-
 	/**
 	 * Configure Jackson's {@link JsonMapper} to be used to serialize the
 	 * {@link ConfigurationProperties @ConfigurationProperties} objects into a {@link Map}

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/env/EnvironmentEndpoint.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -193,19 +193,6 @@ private void extract(String root, Map<String, PropertySource<?>> map, PropertySo
 		}
 	}
 
-	/**
-	 * Apply sanitization to the given name and value.
-	 * @param key the name to sanitize
-	 * @param value the value to sanitize
-	 * @return the sanitized value
-	 * @deprecated since 2.6.0 for removal in 2.8.0 as sanitization should be internal to
-	 * the class
-	 */
-	@Deprecated
-	public Object sanitize(String key, Object value) {
-		return this.sanitizer.sanitize(key, value);
-	}
-
 	private Object sanitize(PropertySource<?> source, String name, Object value) {
 		return this.sanitizer.sanitize(new SanitizableData(source, name, value));
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/AbstractRabbitListenerContainerFactoryConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -47,16 +47,6 @@ public abstract class AbstractRabbitListenerContainerFactoryConfigurer<T extends
 
 	private RabbitProperties rabbitProperties;
 
-	/**
-	 * Creates a new configurer.
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
-	 * {@link #AbstractRabbitListenerContainerFactoryConfigurer(RabbitProperties)}
-	 */
-	@Deprecated
-	protected AbstractRabbitListenerContainerFactoryConfigurer() {
-
-	}
-
 	/**
 	 * Creates a new configurer that will use the given {@code rabbitProperties}.
 	 * @param rabbitProperties properties to use
@@ -91,17 +81,6 @@ protected void setRetryTemplateCustomizers(List<RabbitRetryTemplateCustomizer> r
 		this.retryTemplateCustomizers = retryTemplateCustomizers;
 	}
 
-	/**
-	 * Set the {@link RabbitProperties} to use.
-	 * @param rabbitProperties the {@link RabbitProperties}
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
-	 * {@link #AbstractRabbitListenerContainerFactoryConfigurer(RabbitProperties)}
-	 */
-	@Deprecated
-	protected void setRabbitProperties(RabbitProperties rabbitProperties) {
-		this.rabbitProperties = rabbitProperties;
-	}
-
 	protected final RabbitProperties getRabbitProperties() {
 		return this.rabbitProperties;
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/DirectRabbitListenerContainerFactoryConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -31,16 +31,6 @@
 public final class DirectRabbitListenerContainerFactoryConfigurer
 		extends AbstractRabbitListenerContainerFactoryConfigurer<DirectRabbitListenerContainerFactory> {
 
-	/**
-	 * Creates a new configurer.
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
-	 * {@link #DirectRabbitListenerContainerFactoryConfigurer(RabbitProperties)}
-	 */
-	@Deprecated
-	public DirectRabbitListenerContainerFactoryConfigurer() {
-		super();
-	}
-
 	/**
 	 * Creates a new configurer that will use the given {@code rabbitProperties}.
 	 * @param rabbitProperties properties to use

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitTemplateConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -39,16 +39,6 @@ public class RabbitTemplateConfigurer {
 
 	private RabbitProperties rabbitProperties;
 
-	/**
-	 * Creates a new configurer.
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
-	 * {@link #RabbitTemplateConfigurer(RabbitProperties)}
-	 */
-	@Deprecated
-	public RabbitTemplateConfigurer() {
-
-	}
-
 	/**
 	 * Creates a new configurer that will use the given {@code rabbitProperties}.
 	 * @param rabbitProperties properties to use
@@ -78,17 +68,6 @@ public void setRetryTemplateCustomizers(List<RabbitRetryTemplateCustomizer> retr
 		this.retryTemplateCustomizers = retryTemplateCustomizers;
 	}
 
-	/**
-	 * Set the {@link RabbitProperties} to use.
-	 * @param rabbitProperties the {@link RabbitProperties}
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
-	 * {@link #RabbitTemplateConfigurer(RabbitProperties)}
-	 */
-	@Deprecated
-	protected void setRabbitProperties(RabbitProperties rabbitProperties) {
-		this.rabbitProperties = rabbitProperties;
-	}
-
 	protected final RabbitProperties getRabbitProperties() {
 		return this.rabbitProperties;
 	}

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/SimpleRabbitListenerContainerFactoryConfigurer.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2021 the original author or authors.
+ * Copyright 2012-2022 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.
@@ -31,16 +31,6 @@
 public final class SimpleRabbitListenerContainerFactoryConfigurer
 		extends AbstractRabbitListenerContainerFactoryConfigurer<SimpleRabbitListenerContainerFactory> {
 
-	/**
-	 * Creates a new configurer.
-	 * @deprecated since 2.6.0 for removal in 2.8.0 in favor of
-	 * {@link #SimpleRabbitListenerContainerFactoryConfigurer(RabbitProperties)}
-	 */
-	@Deprecated
-	public SimpleRabbitListenerContainerFactoryConfigurer() {
-		super();
-	}
-
 	/**
 	 * Creates a new configurer that will use the given {@code rabbitProperties}.
 	 * @param rabbitProperties properties to use

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchAutoConfiguration.java

@@ -108,8 +108,7 @@ public SimpleJobOperator jobOperator(ObjectProvider<JobParametersConverter> jobP
 	static class DataSourceInitializerConfiguration {
 
 		@Bean
-		@SuppressWarnings("deprecation")
-		@ConditionalOnMissingBean({ BatchDataSourceScriptDatabaseInitializer.class, BatchDataSourceInitializer.class })
+		@ConditionalOnMissingBean(BatchDataSourceScriptDatabaseInitializer.class)
 		BatchDataSourceScriptDatabaseInitializer batchDataSourceInitializer(DataSource dataSource,
 				@BatchDataSource ObjectProvider<DataSource> batchDataSource, BatchProperties properties) {
 			return new BatchDataSourceScriptDatabaseInitializer(batchDataSource.getIfAvailable(() -> dataSource),