Skip to content

Commit 57cbfc1

Browse files
committed
Fix outdated docs not consistent with code
1 parent 256a523 commit 57cbfc1

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

spring-boot-project/spring-boot-docs/src/docs/asciidoc/using/using-the-springbootapplication-annotation.adoc

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

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

1010
[source,java,indent=0,subs="verbatim"]
1111
----
@@ -24,5 +24,5 @@ For instance, you may not want to use component scan or configuration properties
2424
include::{docs-java}/using/usingthespringbootapplicationannotation/individualannotations/MyApplication.java[]
2525
----
2626
27-
In this example, `Application` is just like any other Spring Boot application except that `@Component`-annotated classes and `@ConfigurationProperties`-annotated classes are not detected automatically and the user-defined beans are imported explicitly (see `@Import`).
27+
In this example, `MyApplication` is just like any other Spring Boot application except that `@Component`-annotated classes and `@ConfigurationProperties`-annotated classes are not detected automatically and the user-defined beans are imported explicitly (see `@Import`).
2828
====

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/using/usingthespringbootapplicationannotation/individualannotations/MyApplication.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
package org.springframework.boot.docs.using.usingthespringbootapplicationannotation.individualannotations;
1818

1919
import org.springframework.boot.SpringApplication;
20+
import org.springframework.boot.SpringBootConfiguration;
2021
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
21-
import org.springframework.context.annotation.Configuration;
2222
import org.springframework.context.annotation.Import;
2323

24-
@Configuration(proxyBeanMethods = false)
24+
@SpringBootConfiguration(proxyBeanMethods = false)
2525
@EnableAutoConfiguration
2626
@Import({ SomeConfiguration.class, AnotherConfiguration.class })
2727
public class MyApplication {

spring-boot-project/spring-boot-docs/src/main/java/org/springframework/boot/docs/using/usingthespringbootapplicationannotation/springapplication/MyApplication.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.springframework.boot.SpringApplication;
2020
import org.springframework.boot.autoconfigure.SpringBootApplication;
2121

22-
@SpringBootApplication // same as @Configuration @EnableAutoConfiguration @ComponentScan
22+
@SpringBootApplication // same as @SpringBootConfiguration @EnableAutoConfiguration @ComponentScan
2323
public class MyApplication {
2424

2525
public static void main(String[] args) {

0 commit comments

Comments
 (0)