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

Remove multi config runApplication extension

Browse Source 
Closes gh-10511
This commit is contained in:
Stephane Nicoll
2017-11-02 12:04:22 +01:00
parent 944216e11f
commit e28b98c59d
2 changed files with 0 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot-project/spring-boot/src/main/kotlin/org/springframework/boot/SpringApplicationExtensions.kt
View File

@@ -42,16 +42,3 @@ inline fun <reified T : Any> runApplication(vararg args: String): ConfigurableAp
*/
inline fun <reified T : Any> runApplication(vararg args: String, init: SpringApplication.() -> Unit): ConfigurableApplicationContext =
SpringApplication(T::class.java).apply(init).run(*args)
/**
* Top level function acting as a Kotlin shortcut allowing to write
* `runApplication(arrayOf(FooApplication::class, FooConfiguration::class), arg1, arg2) { // Optional SpringApplication customization ... }`
* instead of instantiating `SpringApplication` class, customize it and then invoking
* `run(arrayOf(arg1, arg2))`.`
*
* @author Sebastien Deleuze
* @since 2.0.0
*/
fun runApplication(primarySources: Array<KClass<*>>, vararg args: String, init: SpringApplication.() -> Unit = {}): ConfigurableApplicationContext =
SpringApplication(*primarySources.map { it.java }.toTypedArray()).apply(init).run(*args)

36
spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/SpringApplicationExtensionsTests.kt
View File

@@ -70,42 +70,6 @@ class SpringApplicationExtensionsTests {
assertEquals(environment, context.environment)
}
@Test
fun `Kotlin runApplication(array of KClass) top level function`() {
val context = runApplication(arrayOf(ExampleConfig::class, ExampleWebConfig::class))
assertNotNull(context)
}
@Test
fun `Kotlin runApplication(array of KClass) top level function with a custom environment`() {
val environment = StandardEnvironment()
val context = runApplication(arrayOf(ExampleConfig::class, ExampleWebConfig::class)) {
setEnvironment(environment)
}
assertNotNull(context)
assertEquals(environment, context.environment)
}
@Test
fun `Kotlin runApplication(array of KClass, arg1, arg2) top level function`() {
val context = runApplication(arrayOf(ExampleConfig::class, ExampleWebConfig::class), "--debug", "spring", "boot")
val args = context.getBean<ApplicationArguments>()
assertArrayEquals(arrayOf("spring", "boot"), args.nonOptionArgs.toTypedArray())
assertTrue(args.containsOption("debug"))
}
@Test
fun `Kotlin runApplication(array of KClass, arg1, arg2) top level function with a custom environment`() {
val environment = StandardEnvironment()
val context = runApplication(arrayOf(ExampleConfig::class, ExampleWebConfig::class), "--debug", "spring", "boot") {
setEnvironment(environment)
}
val args = context.getBean<ApplicationArguments>()
assertArrayEquals(arrayOf("spring", "boot"), args.nonOptionArgs.toTypedArray())
assertTrue(args.containsOption("debug"))
assertEquals(environment, context.environment)
}
@Configuration
internal open class ExampleConfig