Merge branch '2.4.x'

Closes gh-25826
2021-03-29 15:47:30 -07:00
parent f3c9cc85cb 363f5829d1
commit 44b1751bb4
59 changed files with 145 additions and 119 deletions
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/Bootstrapper.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/Bootstrapper.java
@@ -24,7 +24,8 @@ package org.springframework.boot;
 * @since 2.4.0
 * @see SpringApplication#addBootstrapper(Bootstrapper)
 * @see BootstrapRegistry
- * @deprecated since 2.4.5 in favor of {@link BootstrapRegistryInitializer}
+ * @deprecated since 2.4.5 for removal in 2.6 in favor of
+ * {@link BootstrapRegistryInitializer}
 */
@Deprecated
 public interface Bootstrapper {
@@ -41,7 +42,7 @@ public interface Bootstrapper {
 	/**
 	 * Initialize the given {@link BootstrapRegistry} with any required registrations.
 	 * @param registry the registry to initialize
-	 * @deprecated since 2.4.4 in favor of
+	 * @deprecated since 2.4.4 for removal in 2.6 in favor of
 	 * {@link Bootstrapper#initialize(BootstrapRegistry)}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
@@ -164,7 +164,8 @@ public class SpringApplication {
 	/**
 	 * The class name of application context that will be used by default for non-web
 	 * environments.
-	 * @deprecated since 2.4.0 in favour of using a {@link ApplicationContextFactory}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of using a
+	 * {@link ApplicationContextFactory}
 	 */
 	@Deprecated
 	public static final String DEFAULT_CONTEXT_CLASS = "org.springframework.context."
@@ -173,7 +174,8 @@ public class SpringApplication {
 	/**
 	 * The class name of application context that will be used by default for web
 	 * environments.
-	 * @deprecated since 2.4.0 in favour of using an {@link ApplicationContextFactory}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of using an
+	 * {@link ApplicationContextFactory}
 	 */
 	@Deprecated
 	public static final String DEFAULT_SERVLET_WEB_CONTEXT_CLASS = "org.springframework.boot."
@@ -182,7 +184,8 @@ public class SpringApplication {
 	/**
 	 * The class name of application context that will be used by default for reactive web
 	 * environments.
-	 * @deprecated since 2.4.0 in favour of using an {@link ApplicationContextFactory}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of using an
+	 * {@link ApplicationContextFactory}
 	 */
 	@Deprecated
 	public static final String DEFAULT_REACTIVE_WEB_CONTEXT_CLASS = "org.springframework."
@@ -1056,7 +1059,7 @@ public class SpringApplication {
 	 * {@link BootstrapRegistry}.
 	 * @param bootstrapper the bootstraper
 	 * @since 2.4.0
-	 * @deprecated since 2.4.5 in favor of
+	 * @deprecated since 2.4.5 for removal in 2.6 in favor of
 	 * {@link #addBootstrapRegistryInitializer(BootstrapRegistryInitializer)}
 	 */
 	@Deprecated
@@ -1230,7 +1233,7 @@ public class SpringApplication {
 	 * applications or {@link AnnotationConfigApplicationContext} for non web based
 	 * applications.
 	 * @param applicationContextClass the context class to set
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #setApplicationContextFactory(ApplicationContextFactory)}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListener.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplicationRunListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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,7 +47,8 @@ public interface SpringApplicationRunListener {
 	/**
 	 * Called immediately when the run method has first started. Can be used for very
 	 * early initialization.
-	 * @deprecated since 2.4.0 in favor of {@link #starting(ConfigurableBootstrapContext)}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * {@link #starting(ConfigurableBootstrapContext)}
 	 */
 	@Deprecated
 	default void starting() {
@@ -68,7 +69,7 @@ public interface SpringApplicationRunListener {
 	 * Called once the environment has been prepared, but before the
 	 * {@link ApplicationContext} has been created.
 	 * @param environment the environment
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #environmentPrepared(ConfigurableBootstrapContext, ConfigurableEnvironment)}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java
@@ -276,7 +276,7 @@ public class SpringApplicationBuilder {
 	 * Explicitly set the context class to be used.
 	 * @param cls the context class to use
 	 * @return the current builder
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #contextFactory(ApplicationContextFactory)}
 	 */
 	@Deprecated
@@ -405,7 +405,7 @@ public class SpringApplicationBuilder {
 	 * @param bootstrapper the bootstraper
 	 * @return the current builder
 	 * @since 2.4.0
-	 * @deprecated since 2.4.5 in favor of
+	 * @deprecated since 2.4.5 for removal in 2.6 in favor of
 	 * {@link #addBootstrapRegistryInitializer(BootstrapRegistryInitializer)}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/cloud/CloudFoundryVcapEnvironmentPostProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -107,7 +107,7 @@ public class CloudFoundryVcapEnvironmentPostProcessor

 	/**
 	 * Create a new {@link CloudFoundryVcapEnvironmentPostProcessor} instance.
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #CloudFoundryVcapEnvironmentPostProcessor(Log)}
 	 */
 	@Deprecated
@@ -154,8 +154,8 @@ public class CloudFoundryVcapEnvironmentPostProcessor

 	/**
 	 * Event listener used to switch logging.
-	 * @deprecated since 2.4.0 in favor of only using {@link EnvironmentPostProcessor}
-	 * callbacks
+	 * @deprecated since 2.4 for removal in 2.6 in favor of only using
+	 * {@link EnvironmentPostProcessor} callbacks
 	 */
 	@Deprecated
 	@Override
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/ConfigFileApplicationListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -112,7 +112,8 @@ import org.springframework.util.StringUtils;
 * @author Madhura Bhave
 * @author Scott Frederick
 * @since 1.0.0
- * @deprecated since 2.4.0 in favor of {@link ConfigDataEnvironmentPostProcessor}
+ * @deprecated since 2.4 for removal in 2.6 in favor of
+ * {@link ConfigDataEnvironmentPostProcessor}
 */
@Deprecated
 public class ConfigFileApplicationListener implements EnvironmentPostProcessor, SmartApplicationListener, Ordered {
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/FilteredPropertySource.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/config/FilteredPropertySource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -28,7 +28,8 @@ import org.springframework.core.env.PropertySource;
 * {@link ConfigFileApplicationListener} to filter out properties for specific operations.
 *
 * @author Phillip Webb
- * @deprecated since 2.4.0 along with {@link ConfigFileApplicationListener}
+ * @deprecated since 2.4 for removal in 2.6 along with
+ * {@link ConfigFileApplicationListener}
 */
@Deprecated
 class FilteredPropertySource extends PropertySource<PropertySource<?>> {
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationEnvironmentPreparedEvent.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationEnvironmentPreparedEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -40,7 +40,7 @@ public class ApplicationEnvironmentPreparedEvent extends SpringApplicationEvent
 	 * @param application the current application
 	 * @param args the arguments the application is running with
 	 * @param environment the environment that was just created
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #ApplicationEnvironmentPreparedEvent(ConfigurableBootstrapContext, SpringApplication, String[], ConfigurableEnvironment)}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationStartingEvent.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/event/ApplicationStartingEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -42,7 +42,7 @@ public class ApplicationStartingEvent extends SpringApplicationEvent {
 	 * Create a new {@link ApplicationStartingEvent} instance.
 	 * @param application the current application
 	 * @param args the arguments the application is running with
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link #ApplicationStartingEvent(ConfigurableBootstrapContext, SpringApplication, String[])}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/ClasspathLoggingApplicationListener.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/logging/ClasspathLoggingApplicationListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -38,8 +38,9 @@ import org.springframework.core.ResolvableType;
 *
 * @author Andy Wilkinson
 * @since 2.0.0
- * @deprecated since 2.4.0 with no direct replacement. {@link FailureAnalysis} is now the
- * preferred approach for diagnosing and reporting startup failures.
+ * @deprecated since 2.4 for removal in 2.6 with no direct replacement.
+ * {@link FailureAnalysis} is now the preferred approach for diagnosing and reporting
+ * startup failures.
 */
@Deprecated
 public final class ClasspathLoggingApplicationListener implements GenericApplicationListener {
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/EmbeddedDatabaseConnection.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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,7 +63,8 @@ public enum EmbeddedDatabaseConnection {

 	/**
 	 * HSQL Database Connection.
-	 * @deprecated since 2.4.0 in favor of {@link EmbeddedDatabaseConnection#HSQLDB}.
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * {@link EmbeddedDatabaseConnection#HSQLDB}.
 	 */
 	@Deprecated
 	HSQL(EmbeddedDatabaseType.HSQL, DatabaseDriver.HSQLDB.getDriverClassName(), "org.hsqldb.jdbcDriver",
@@ -140,7 +141,8 @@ public enum EmbeddedDatabaseConnection {
 	 * database type.
 	 * @param driverClass the driver class
 	 * @return true if the driver class is one of the embedded types
-	 * @deprecated since 2.4.0 in favor of {@link #isEmbedded(String, String)}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
+	 * {@link #isEmbedded(String, String)}
 	 */
 	@Deprecated
 	public static boolean isEmbedded(String driverClass) {
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java
@@ -83,7 +83,7 @@ public class LoggingSystemProperties {
 	/**
 	 * The name of the System property that contains the rolled-over log file name
 	 * pattern.
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_FILE_NAME_PATTERN}
 	 */
 	@Deprecated
@@ -91,7 +91,7 @@ public class LoggingSystemProperties {

 	/**
 	 * The name of the System property that contains the clean history on start flag.
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_CLEAN_HISTORY_ON_START}
 	 */
 	@Deprecated
@@ -99,7 +99,7 @@ public class LoggingSystemProperties {

 	/**
 	 * The name of the System property that contains the file log max size.
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_MAX_FILE_SIZE}
 	 */
 	@Deprecated
@@ -107,7 +107,7 @@ public class LoggingSystemProperties {

 	/**
 	 * The name of the System property that contains the file total size cap.
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_TOTAL_SIZE_CAP}
 	 */
 	@Deprecated
@@ -115,7 +115,7 @@ public class LoggingSystemProperties {

 	/**
 	 * The name of the System property that contains the file log max history.
-	 * @deprecated since 2.4.0 in favor of
+	 * @deprecated since 2.4 for removal in 2.6 in favor of
 	 * {@link org.springframework.boot.logging.logback.LogbackLoggingSystemProperties#ROLLINGPOLICY_MAX_HISTORY}
 	 */
 	@Deprecated
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/rsocket/netty/NettyRSocketServerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/embedded/undertow/UndertowServletWebServerFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 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.
@@ -250,7 +250,7 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
 	 * Return if filters should be initialized eagerly.
 	 * @return {@code true} if filters are initialized eagerly, otherwise {@code false}.
 	 * @since 2.0.0
-	 * @deprecated since 2.4.0 in favor of {@link #isEagerFilterInit()}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of {@link #isEagerFilterInit()}
 	 */
 	@Deprecated
 	public boolean isEagerInitFilters() {
@@ -262,7 +262,7 @@ public class UndertowServletWebServerFactory extends AbstractServletWebServerFac
 	 * @param eagerInitFilters {@code true} if filters are initialized eagerly, otherwise
 	 * {@code false}.
 	 * @since 2.0.0
-	 * @deprecated since 2.4.0 in favor of {@link #isEagerFilterInit()}
+	 * @deprecated since 2.4 for removal in 2.6 in favor of {@link #isEagerFilterInit()}
 	 */
 	@Deprecated
 	public void setEagerInitFilters(boolean eagerInitFilters) {