Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.4.x'

Browse Source 
Closes gh-44993
This commit is contained in:
Phillip Webb
2025-04-03 18:03:09 -07:00
parent 455bb0f835 c96835bc9d
commit bc91c35644
149 changed files with 160 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/ResourceBanner.java
View File

@@ -155,7 +155,7 @@ public class ResourceBanner implements Banner {
* Returns the application version.
* @param sourceClass the source class
* @return the application version or {@code null} if unknown
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@Deprecated(since = "3.4.0", forRemoval = true)
protected String getApplicationVersion(Class<?> sourceClass) {

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/SpringApplication.java
View File

@@ -630,7 +630,7 @@ public class SpringApplication {
* Called to log startup information, subclasses may override to add additional
* logging.
* @param isRoot true if this application is the root of a context hierarchy
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link #logStartupInfo(ConfigurableApplicationContext)}
*/
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/annotation/Configurations.java
View File

@@ -104,7 +104,7 @@ public abstract class Configurations {
* Sort configuration classes into the order that they should be applied.
* @param classes the classes to sort
* @return a sorted set of classes
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link #Configurations(UnaryOperator, Collection, Function)}
*/
@Deprecated(since = "3.4.0", forRemoval = true)

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/io/ApplicationResourceLoader.java
View File

@@ -53,7 +53,7 @@ public class ApplicationResourceLoader extends DefaultResourceLoader {
/**
* Create a new {@code ApplicationResourceLoader}.
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of {@link #get()}
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of {@link #get()}
*/
@Deprecated(since = "3.4.0", forRemoval = true)
public ApplicationResourceLoader() {
@@ -65,7 +65,7 @@ public class ApplicationResourceLoader extends DefaultResourceLoader {
* @param classLoader the {@link ClassLoader} to load class path resources with, or
* {@code null} for using the thread context class loader at the time of actual
* resource access
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of {@link #get(ClassLoader)}
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of {@link #get(ClassLoader)}
*/
@Deprecated(since = "3.4.0", forRemoval = true)
public ApplicationResourceLoader(ClassLoader classLoader) {

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/HikariCheckpointRestoreLifecycle.java
View File

@@ -81,7 +81,7 @@ public class HikariCheckpointRestoreLifecycle implements Lifecycle {
* {@link DataSourceUnwrapper#unwrap unwrapped} to a {@link HikariDataSource}. If such
* unwrapping is not possible, the lifecycle will have no effect.
* @param dataSource the checkpoint-restore participant
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link #HikariCheckpointRestoreLifecycle(DataSource, ConfigurableApplicationContext)}
*/
@Deprecated(since = "3.4.0", forRemoval = true)

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggingSystemProperties.java
View File

@@ -148,7 +148,7 @@ public class LoggingSystemProperties {
/**
* Returns the default charset.
* @return the default charset
* @deprecated since 3.5.0 for removal in 3.7.0 in favor of
* @deprecated since 3.5.0 for removal in 4.0.0 in favor of
* {@link #getDefaultConsoleCharset()} and {@link #getDefaultFileCharset()}.
*/
@Deprecated(since = "3.5.0", forRemoval = true)
@@ -202,7 +202,7 @@ public class LoggingSystemProperties {
value = mapper.apply(value);
setSystemProperty(property.getEnvironmentVariableName(), value);
if (property == LoggingSystemProperty.APPLICATION_NAME && StringUtils.hasText(value)) {
// LOGGED_APPLICATION_NAME is deprecated for removal in 3.6.0
// LOGGED_APPLICATION_NAME is deprecated for removal in 4.0.0
setSystemProperty("LOGGED_APPLICATION_NAME", "[%s] ".formatted(value));
}
}

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/ApplicationNameConverter.java
View File

@@ -31,7 +31,7 @@ import org.springframework.boot.logging.LoggingSystemProperty;
* @author Andy Wilkinson
* @author Phillip Webb
* @since 3.2.4
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link EnclosedInSquareBracketsConverter}
*/
@Deprecated(since = "3.4.0", forRemoval = true)

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/orm/jpa/EntityManagerFactoryBuilder.java
View File

@@ -106,7 +106,7 @@ public class EntityManagerFactoryBuilder {
* @param jpaProperties the JPA properties to be passed to the persistence provider
* @param persistenceUnitManager optional source of persistence unit information (can
* be null)
* @deprecated since 3.4.4 for removal in 3.6.0 in favor of
* @deprecated since 3.4.4 for removal in 4.0.0 in favor of
* {@link #EntityManagerFactoryBuilder(JpaVendorAdapter, Function, PersistenceUnitManager)}
*/
@Deprecated(since = "3.4.4", forRemoval = true)
@@ -125,7 +125,7 @@ public class EntityManagerFactoryBuilder {
* @param persistenceUnitRootLocation the persistence unit root location to use as a
* fallback or {@code null}
* @since 1.4.1
* @deprecated since 3.4.4 for removal in 3.6.0 in favor of
* @deprecated since 3.4.4 for removal in 4.0.0 in favor of
* {@link #EntityManagerFactoryBuilder(JpaVendorAdapter, Function, PersistenceUnitManager, URL)}
*/
@Deprecated(since = "3.4.4", forRemoval = true)

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/task/ThreadPoolTaskSchedulerBuilder.java
View File

@@ -68,7 +68,7 @@ public class ThreadPoolTaskSchedulerBuilder {
* @param threadNamePrefix the prefix to use for the names of newly created threads
* @param taskSchedulerCustomizers the customizers to apply to the
* {@link ThreadPoolTaskScheduler}
* @deprecated since 3.5.0 for removal in 3.7.0 in favor of the default constructor
* @deprecated since 3.5.0 for removal in 4.0.0 in favor of the default constructor
*/
@Deprecated(since = "3.5.0", forRemoval = true)
public ThreadPoolTaskSchedulerBuilder(Integer poolSize, Boolean awaitTermination, Duration awaitTerminationPeriod,

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactories.java
View File

@@ -37,7 +37,7 @@ import org.springframework.util.ClassUtils;
* @author Phillip Webb
* @author Scott Frederick
* @since 3.0.0
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link ClientHttpRequestFactoryBuilder}
*/
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettings.java
View File

@@ -33,7 +33,7 @@ import org.springframework.http.client.ClientHttpRequestFactory;
* @author Scott Frederick
* @since 3.0.0
* @see ClientHttpRequestFactoryBuilder
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link org.springframework.boot.http.client.ClientHttpRequestFactorySettings}
*/
@Deprecated(since = "3.4.0", forRemoval = true)

8
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
View File

@@ -333,7 +333,7 @@ public class RestTemplateBuilder {
* @param requestFactoryFunction the settings to request factory function
* @return a new builder instance
* @since 3.0.0
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link #requestFactoryBuilder(ClientHttpRequestFactoryBuilder)}
* @see ClientHttpRequestFactoryBuilder
* @see #requestFactoryBuilder(ClientHttpRequestFactoryBuilder)
@@ -473,7 +473,7 @@ public class RestTemplateBuilder {
* @param connectTimeout the connection timeout
* @return a new builder instance.
* @since 2.1.0
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link #connectTimeout(Duration)}
*/
@Deprecated(since = "3.4.0", forRemoval = true)
@@ -499,7 +499,7 @@ public class RestTemplateBuilder {
* @param readTimeout the read timeout
* @return a new builder instance.
* @since 2.1.0
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link #readTimeout(Duration)}
*/
@Deprecated(since = "3.4.0", forRemoval = true)
@@ -538,7 +538,7 @@ public class RestTemplateBuilder {
* @param sslBundle the SSL bundle
* @return a new builder instance
* @since 3.1.0
* @deprecated since 3.4.0 for removal in 3.6.0 in favor of
* @deprecated since 3.4.0 for removal in 4.0.0 in favor of
* {@link #sslBundle(SslBundle)}
*/
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactoriesTests.java
View File

@@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalStateException;
* Tests for {@link ClientHttpRequestFactories}.
*
* @author Andy Wilkinson
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/ClientHttpRequestFactorySettingsTests.java
View File

@@ -29,7 +29,7 @@ import static org.mockito.Mockito.mock;
* Tests for {@link ClientHttpRequestFactorySettings}.
*
* @author Phillip Webb
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderJettyClientIntegrationTests.java
View File

@@ -35,7 +35,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* available and, therefore, Jetty's client is used instead.
*
* @author Stephane Nicoll
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@ClassPathExclusions("httpclient5-*.jar")
@SuppressWarnings("removal")

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderReactorClientIntegrationTests.java
View File

@@ -36,7 +36,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* predominant HTTP client.
*
* @author Andy Wilkinson
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@ClassPathExclusions({ "httpclient5-*.jar", "jetty-client-*.jar" })
@SuppressWarnings("removal")

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderSimpleIntegrationTests.java
View File

@@ -33,7 +33,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* available
*
* @author Stephane Nicoll
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@ClassPathExclusions({ "httpclient5-*.jar", "jetty-client-*.jar", "reactor-netty-http-*.jar" })
@SuppressWarnings("removal")

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/webservices/client/HttpWebServiceMessageSenderBuilderTests.java
View File

@@ -33,7 +33,7 @@ import static org.mockito.Mockito.mock;
* Tests for {@link HttpWebServiceMessageSenderBuilder}.
*
* @author Stephane Nicoll
* @deprecated since 3.4.0 for removal in 3.6.0
* @deprecated since 3.4.0 for removal in 4.0.0
*/
@SuppressWarnings("removal")
@Deprecated(since = "3.4.0", forRemoval = true)