From e447c49f3b766ceebed17b292000090e4123226c Mon Sep 17 00:00:00 2001 From: 1993heqiang <531364804@qq.com> Date: Fri, 10 Mar 2023 20:56:50 +0800 Subject: [PATCH 1/2] Update two references to old APIs in the docs See gh-34567 --- .../spring-boot-docs/src/docs/asciidoc/data/sql.adoc | 2 +- .../src/docs/asciidoc/features/spring-application.adoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/sql.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/sql.adoc index 330c7c522a00..c01628d7cffd 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/sql.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/sql.adoc @@ -298,7 +298,7 @@ For more advanced queries, a `@Query` annotation is provided. Spring Boot will auto-configure Spring Data's JDBC repositories when the necessary dependencies are on the classpath. They can be added to your project with a single dependency on `spring-boot-starter-data-jdbc`. -If necessary, you can take control of Spring Data JDBC's configuration by adding the `@EnableJdbcRepositories` annotation or a `JdbcConfiguration` subclass to your application. +If necessary, you can take control of Spring Data JDBC's configuration by adding the `@EnableJdbcRepositories` annotation or a `AbstractJdbcConfiguration` subclass to your application. TIP: For complete details of Spring Data JDBC, see the {spring-data-jdbc-docs}[reference documentation]. diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/spring-application.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/spring-application.adoc index 2bb3a118703b..2494321e2e51 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/spring-application.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/features/spring-application.adoc @@ -289,7 +289,7 @@ The algorithm used to determine a `WebApplicationType` is the following: This means that if you are using Spring MVC and the new `WebClient` from Spring WebFlux in the same application, Spring MVC will be used by default. You can override that easily by calling `setWebApplicationType(WebApplicationType)`. -It is also possible to take complete control of the `ApplicationContext` type that is used by calling `setApplicationContextClass(...)`. +It is also possible to take complete control of the `ApplicationContext` type that is used by calling `setApplicationContextFactory(...)`. TIP: It is often desirable to call `setWebApplicationType(WebApplicationType.NONE)` when using `SpringApplication` within a JUnit test. From da156224aa691b4ff34d072504968967bd3141c0 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 14 Mar 2023 14:50:51 +0000 Subject: [PATCH 2/2] Polish "Update two references to old APIs in the docs" See gh-34567 --- .../spring-boot-docs/src/docs/asciidoc/data/sql.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/sql.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/sql.adoc index c01628d7cffd..a16d6c45fd31 100644 --- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/sql.adoc +++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/sql.adoc @@ -298,7 +298,7 @@ For more advanced queries, a `@Query` annotation is provided. Spring Boot will auto-configure Spring Data's JDBC repositories when the necessary dependencies are on the classpath. They can be added to your project with a single dependency on `spring-boot-starter-data-jdbc`. -If necessary, you can take control of Spring Data JDBC's configuration by adding the `@EnableJdbcRepositories` annotation or a `AbstractJdbcConfiguration` subclass to your application. +If necessary, you can take control of Spring Data JDBC's configuration by adding the `@EnableJdbcRepositories` annotation or an `AbstractJdbcConfiguration` subclass to your application. TIP: For complete details of Spring Data JDBC, see the {spring-data-jdbc-docs}[reference documentation].