Skip to content

Commit a5f077c

Browse files
quaffwilkinsona
authored andcommitted
Update docs to use @SpringBootConfiguration not @configuration
See gh-26937
1 parent b8a5d9b commit a5f077c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

spring-boot-project/spring-boot-docs/src/docs/asciidoc/using-spring-boot.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -364,7 +364,7 @@ A single `@SpringBootApplication` annotation can be used to enable those three f
364364

365365
* `@EnableAutoConfiguration`: enable <<using-boot-auto-configuration,Spring Boot's auto-configuration mechanism>>
366366
* `@ComponentScan`: enable `@Component` scan on the package where the application is located (see <<using-boot-structuring-your-code,the best practices>>)
367-
* `@Configuration`: allow to register extra beans in the context or import additional configuration classes
367+
* `@SpringBootConfiguration`: an alternative to Spring's standard `@Configuration`, allow to register extra beans in the context or import additional configuration classes
368368

369369
[source,java,indent=0]
370370
----
@@ -373,7 +373,7 @@ A single `@SpringBootApplication` annotation can be used to enable those three f
373373
import org.springframework.boot.SpringApplication;
374374
import org.springframework.boot.autoconfigure.SpringBootApplication;
375375
376-
@SpringBootApplication // same as @Configuration @EnableAutoConfiguration @ComponentScan
376+
@SpringBootApplication // same as @SpringBootConfiguration @EnableAutoConfiguration @ComponentScan
377377
public class Application {
378378
379379
public static void main(String[] args) {
@@ -395,11 +395,11 @@ For instance, you may not want to use component scan or configuration properties
395395
package com.example.myapplication;
396396
397397
import org.springframework.boot.SpringApplication;
398+
import org.springframework.boot.SpringBootConfiguration;
398399
import org.springframework.context.annotation.ComponentScan
399-
import org.springframework.context.annotation.Configuration;
400400
import org.springframework.context.annotation.Import;
401401
402-
@Configuration(proxyBeanMethods = false)
402+
@SpringBootConfiguration(proxyBeanMethods = false)
403403
@EnableAutoConfiguration
404404
@Import({ MyConfig.class, MyAnotherConfig.class })
405405
public class Application {

0 commit comments

Comments
 (0)