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

Merge branch '2.4.x'

Browse Source 
Closes gh-25826
This commit is contained in:
Phillip Webb
2021-03-29 15:47:30 -07:00
parent f3c9cc85cb 363f5829d1
commit 44b1751bb4
59 changed files with 145 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java
View File

@@ -39,7 +39,7 @@ public class BatchProperties {
/**
* Return the datasource schema.
* @return the schema
* @deprecated as of 2.5.0 in favor of {@link Jdbc#getSchema()}
* @deprecated as of 2.5 for removal in 2.7 in favor of {@link Jdbc#getSchema()}
*/
@Deprecated
@DeprecatedConfigurationProperty(replacement = "spring.batch.jdbc.schema")
@@ -55,7 +55,7 @@ public class BatchProperties {
/**
* Return the table prefix.
* @return the table prefix
* @deprecated as of 2.5.0 in favor of {@link Jdbc#getTablePrefix()}
* @deprecated as of 2.5 for removal in 2.7 in favor of {@link Jdbc#getTablePrefix()}
*/
@Deprecated
@DeprecatedConfigurationProperty(replacement = "spring.batch.jdbc.table-prefix")
@@ -71,7 +71,8 @@ public class BatchProperties {
/**
* Return whether the schema should be initialized.
* @return the initialization mode
* @deprecated as of 2.5.0 in favor of {@link Jdbc#getInitializeSchema()}
* @deprecated as of 2.5 for removal in 2.7 in favor of
* {@link Jdbc#getInitializeSchema()}
*/
@Deprecated
@DeprecatedConfigurationProperty(replacement = "spring.batch.jdbc.initialize-schema")

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/EntityManagerFactoryDependsOnPostProcessor.java
View File

@@ -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.
@@ -32,7 +32,7 @@ import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
* @author Andrii Hrytsiuk
* @since 1.1.0
* @see BeanDefinition#setDependsOn(String[])
* @deprecated since 2.5.0 in favor of
* @deprecated since 2.5 for removal in 2.7 in favor of
* {@link org.springframework.boot.autoconfigure.orm.jpa.EntityManagerFactoryDependsOnPostProcessor}
*/
@Deprecated

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationScriptMissingException.java
View File

@@ -25,7 +25,7 @@ import java.util.List;
* @author Anand Shastri
* @author Stephane Nicoll
* @since 2.2.0
* @deprecated since 2.5.0 as location checking is deprecated
* @deprecated since 2.5 for removal in 2.7 as location checking is deprecated
*/
@Deprecated
public class FlywayMigrationScriptMissingException extends RuntimeException {

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationScriptMissingFailureAnalyzer.java
View File

@@ -25,7 +25,7 @@ import org.springframework.boot.diagnostics.FailureAnalysis;
*
* @author Anand Shastri
* @author Stephane Nicoll
* @deprecated since 2.5.0 as location checking is deprecated
* @deprecated since 2.5 for removal in 2.7 as location checking is deprecated
*/
@Deprecated
class FlywayMigrationScriptMissingFailureAnalyzer

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayProperties.java
View File

@@ -546,7 +546,8 @@ public class FlywayProperties {
/**
* Return if a new datasource is being created.
* @return {@code true} if a new datasource is created
* @deprecated since 2.5.0 in favor of directly checking user and url.
* @deprecated since 2.5 for removal in 2.7 in favor of directly checking user and
* url.
*/
@Deprecated
public boolean isCreateDataSource() {

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaHttpMessageConverterConfiguration.java
View File

@@ -42,7 +42,7 @@ import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandl
*
* @author Andy Wilkinson
* @since 1.3.0
* @deprecated since 2.5.0 in favor of a {@link HalConfiguration} bean
* @deprecated since 2.5 for removal in 2.7 in favor of a {@link HalConfiguration} bean
*/
@Deprecated
@Configuration(proxyBeanMethods = false)

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastClientFactory.java
View File

@@ -34,7 +34,7 @@ import org.springframework.util.StringUtils;
*
* @author Vedran Pavic
* @since 2.0.0
* @deprecated since 2.3.4 in favor of using the Hazelcast API directly
* @deprecated since 2.4.3 for removal in 2.6 in favor of using the Hazelcast API directly
*/
@Deprecated
public class HazelcastClientFactory {

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastInstanceFactory.java
View File

@@ -36,7 +36,7 @@ import org.springframework.util.StringUtils;
* @author Stephane Nicoll
* @author Phillip Webb
* @since 1.3.0
* @deprecated since 2.3.4 in favor of using the Hazelcast API directly
* @deprecated since 2.4.3 for removal in 2.6 in favor of using the Hazelcast API directly
*/
@Deprecated
public class HazelcastInstanceFactory {

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceSchemaCreatedEvent.java
View File

@@ -28,7 +28,8 @@ import org.springframework.context.ApplicationEvent;
* @author Dave Syer
* @author Stephane Nicoll
* @since 2.0.0
* @deprecated since 2.5.0 with no replacement as the event is no longer published
* @deprecated since 2.5 for removal in 2.7 with no replacement as the event is no longer
* published
*/
@SuppressWarnings("serial")
@Deprecated

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JdbcOperationsDependsOnPostProcessor.java
View File

@@ -33,7 +33,8 @@ import org.springframework.jdbc.core.JdbcOperations;
* @author Andrii Hrytsiuk
* @since 2.0.4
* @see BeanDefinition#setDependsOn(String[])
* @deprecated since 2.5.0 in favor of {@link DependsOnDatabaseInitializationDetector}
* @deprecated since 2.5 for removal in 2.7 in favor of
* {@link DependsOnDatabaseInitializationDetector}
*/
@Deprecated
public class JdbcOperationsDependsOnPostProcessor extends AbstractDependsOnBeanFactoryPostProcessor {

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/NamedParameterJdbcOperationsDependsOnPostProcessor.java
View File

@@ -31,7 +31,8 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcOperations;
* @author Andrii Hrytsiuk
* @since 2.1.4
* @see BeanDefinition#setDependsOn(String[])
* @deprecated since 2.5.0 in favor of {@link DependsOnDatabaseInitializationDetector}
* @deprecated since 2.5 for removal in 2.7 in favor of
* {@link DependsOnDatabaseInitializationDetector}
*/
@Deprecated
public class NamedParameterJdbcOperationsDependsOnPostProcessor extends AbstractDependsOnBeanFactoryPostProcessor {

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisProperties.java
View File

@@ -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.
@@ -93,7 +93,7 @@ public class ArtemisProperties {
/**
* Return the host of the broker.
* @return the host
* @deprecated as of 2.5.0 in favor of broker url
* @deprecated since 2.5 for removal in 2.7 in favor of broker url
*/
@Deprecated
@DeprecatedConfigurationProperty(replacement = "spring.artemis.broker-url")
@@ -109,7 +109,7 @@ public class ArtemisProperties {
/**
* Return the port of the broker.
* @return the port
* @deprecated as of 2.5.0 in favor of broker url
* @deprecated since 2.5 for removal in 2.7 in favor of broker url
*/
@Deprecated
@DeprecatedConfigurationProperty(replacement = "spring.artemis.broker-url")

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jooq/DslContextDependsOnPostProcessor.java
View File

@@ -30,7 +30,8 @@ import org.springframework.boot.sql.init.dependency.DependsOnDatabaseInitializat
* @author Eddú Meléndez
* @since 2.3.9
* @see BeanDefinition#setDependsOn(String[])
* @deprecated since 2.5.0 in favor of {@link DependsOnDatabaseInitializationDetector}
* @deprecated since 2.5 for removal in 2.7 in favor of
* {@link DependsOnDatabaseInitializationDetector}
*/
@Deprecated
public class DslContextDependsOnPostProcessor extends AbstractDependsOnBeanFactoryPostProcessor {

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java
View File

@@ -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.
@@ -198,7 +198,7 @@ public class MongoProperties {
/**
* Return the GridFS database name.
* @return the GridFS database name
* @deprecated since 2.4.0 in favor of {@link Gridfs#getDatabase()}
* @deprecated since 2.4 for removal in 2.6 in favor of {@link Gridfs#getDatabase()}
*/
@DeprecatedConfigurationProperty(replacement = "spring.data.mongodb.gridfs.database")
@Deprecated

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheEnvironmentCollector.java
View File

@@ -34,8 +34,8 @@ import org.springframework.core.env.Environment;
* @author Dave Syer
* @author Madhura Bhave
* @since 1.2.2
* @deprecated since 2.5.0 in favour of direct addition of values from the Environment to
* the model
* @deprecated since 2.5 for removal in 2.7 in favor of direct addition of values from the
* Environment to the model
*/
@Deprecated
public class MustacheEnvironmentCollector extends DefaultCollector implements EnvironmentAware {

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryBuilder.java
View File

@@ -31,7 +31,7 @@ import io.r2dbc.spi.ConnectionFactoryOptions.Builder;
* @author Tadaya Tsuyukubo
* @author Stephane Nicoll
* @since 2.3.0
* @deprecated since 2.5.0 in favor of
* @deprecated since 2.5 for removal in 2.7 in favor of
* {@link org.springframework.boot.r2dbc.ConnectionFactoryBuilder}
*/
@Deprecated

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/EmbeddedDatabaseConnection.java
View File

@@ -25,7 +25,7 @@ import org.springframework.util.ClassUtils;
* @author Mark Paluch
* @author Stephane Nicoll
* @since 2.3.0
* @deprecated since 2.5.0 in favor of
* @deprecated since 2.5 for removal in 2.7 in favor of
* {@link org.springframework.boot.r2dbc.EmbeddedDatabaseConnection}
*/
@Deprecated

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/ResourceProperties.java
View File

@@ -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.
@@ -31,7 +31,7 @@ import org.springframework.boot.context.properties.DeprecatedConfigurationProper
* @author Venil Noronha
* @author Kristine Jetzke
* @since 1.1.0
* @deprecated since 2.4.0 in favor of {@link WebProperties.Resources}
* @deprecated since 2.4 for removal in 2.6 in favor of {@link WebProperties.Resources}
*/
@Deprecated
@ConfigurationProperties(prefix = "spring.resources", ignoreUnknownFields = false)

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/AbstractErrorWebExceptionHandler.java
View File

@@ -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.
@@ -97,7 +97,7 @@ public abstract class AbstractErrorWebExceptionHandler implements ErrorWebExcept
* @param errorAttributes the error attributes
* @param resourceProperties the resource properties
* @param applicationContext the application context
* @deprecated since 2.4.0 in favor of
* @deprecated since 2.4 for removal in 2.6 in favor of
* {@link #AbstractErrorWebExceptionHandler(ErrorAttributes, Resources, ApplicationContext)}
*/
@Deprecated
@@ -157,7 +157,7 @@ public abstract class AbstractErrorWebExceptionHandler implements ErrorWebExcept
* @param request the source request
* @param includeStackTrace whether to include the error stacktrace information
* @return the error attributes as a Map
* @deprecated since 2.3.0 in favor of
* @deprecated since 2.3 for removal in 2.5 in favor of
* {@link #getErrorAttributes(ServerRequest, ErrorAttributeOptions)}
*/
@Deprecated

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/error/DefaultErrorWebExceptionHandler.java
View File

@@ -97,7 +97,7 @@ public class DefaultErrorWebExceptionHandler extends AbstractErrorWebExceptionHa
* @param resourceProperties the resources configuration properties
* @param errorProperties the error configuration properties
* @param applicationContext the current application context
* @deprecated since 2.4.0 in favor of
* @deprecated since 2.4 for removal in 2.6 in favor of
* {@link #DefaultErrorWebExceptionHandler(ErrorAttributes, Resources, ErrorProperties, ApplicationContext)}
*/
@Deprecated

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java
View File

@@ -553,7 +553,7 @@ public class WebMvcProperties {
/**
* Locale resolution options.
* @deprecated since 2.4.0 in favor of
* @deprecated since 2.4 for removal in 2.6 in favor of
* {@link org.springframework.boot.autoconfigure.web.WebProperties.LocaleResolver}
*/
@Deprecated

4
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/DefaultErrorViewResolver.java
View File

@@ -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.
@@ -78,7 +78,7 @@ public class DefaultErrorViewResolver implements ErrorViewResolver, Ordered {
* Create a new {@link DefaultErrorViewResolver} instance.
* @param applicationContext the source application context
* @param resourceProperties resource properties
* @deprecated since 2.4.0 in favour of
* @deprecated since 2.4 for removal in 2.6 in favor of
* {@link #DefaultErrorViewResolver(ApplicationContext, Resources)}
*/
@Deprecated

2
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/flyway/FlywayMigrationScriptMissingFailureAnalyzerTests.java
View File

@@ -28,7 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* Tests for {@link FlywayMigrationScriptMissingFailureAnalyzer}.
*
* @author Anand Shastri
* @deprecated since 2.5.0 as location checking is deprecated
* @deprecated since 2.5 for removal in 2.7 as location checking is deprecated
*/
@Deprecated
class FlywayMigrationScriptMissingFailureAnalyzerTests {