Skip to content

Commit b5d380c

Browse files
sdeleuzesnicoll
authored andcommitted
Make SpringApplication Kotlin samples idiomatic
See gh-31463
1 parent 21f98b0 commit b5d380c

File tree

4 files changed

+13
-14
lines changed

4 files changed

+13
-14
lines changed

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/springapplication/MyApplication.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616

1717
package org.springframework.boot.docs.features.springapplication
1818

19-
import org.springframework.boot.SpringApplication
2019
import org.springframework.boot.autoconfigure.SpringBootApplication
20+
import org.springframework.boot.runApplication
2121

2222

2323
@SpringBootApplication
2424
class MyApplication
2525

2626
fun main(args: Array<String>) {
27-
SpringApplication.run(MyApplication::class.java, *args)
27+
runApplication<MyApplication>(*args)
2828
}

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/springapplication/applicationexit/MyApplication.kt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ package org.springframework.boot.docs.features.springapplication.applicationexit
1919
import org.springframework.boot.ExitCodeGenerator
2020
import org.springframework.boot.SpringApplication
2121
import org.springframework.boot.autoconfigure.SpringBootApplication
22+
import org.springframework.boot.runApplication
2223
import org.springframework.context.annotation.Bean
2324

2425
import kotlin.system.exitProcess
@@ -27,13 +28,11 @@ import kotlin.system.exitProcess
2728
class MyApplication {
2829

2930
@Bean
30-
fun exitCodeGenerator(): ExitCodeGenerator? {
31-
return ExitCodeGenerator { 42 }
32-
}
31+
fun exitCodeGenerator() = ExitCodeGenerator { 42 }
3332

3433
}
3534

3635
fun main(args: Array<String>) {
3736
exitProcess(SpringApplication.exit(
38-
SpringApplication.run(MyApplication::class.java, *args)))
37+
runApplication<MyApplication>(*args)))
3938
}

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/springapplication/customizingspringapplication/MyApplication.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
package org.springframework.boot.docs.features.springapplication.customizingspringapplication
1818

1919
import org.springframework.boot.Banner
20-
import org.springframework.boot.SpringApplication
2120
import org.springframework.boot.autoconfigure.SpringBootApplication
21+
import org.springframework.boot.runApplication
2222

2323
@SpringBootApplication
2424
class MyApplication
2525

2626
fun main(args: Array<String>) {
27-
val application = SpringApplication(MyApplication::class.java)
28-
application.setBannerMode(Banner.Mode.OFF)
29-
application.run(*args)
27+
runApplication<MyApplication>(*args) {
28+
setBannerMode(Banner.Mode.OFF)
29+
}
3030
}

spring-boot-project/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/features/springapplication/startuptracking/MyApplication.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616

1717
package org.springframework.boot.docs.features.springapplication.startuptracking
1818

19-
import org.springframework.boot.SpringApplication
2019
import org.springframework.boot.autoconfigure.SpringBootApplication
2120
import org.springframework.boot.context.metrics.buffering.BufferingApplicationStartup
21+
import org.springframework.boot.runApplication
2222

2323
@SpringBootApplication
2424
class MyApplication
2525

2626
fun main(args: Array<String>) {
27-
val application = SpringApplication(MyApplication::class.java)
28-
application.applicationStartup = BufferingApplicationStartup(2048)
29-
application.run(*args)
27+
runApplication<MyApplication>(*args) {
28+
applicationStartup = BufferingApplicationStartup(2048)
29+
}
3030
}

0 commit comments

Comments
 (0)