diff --git a/spring-boot-project/spring-boot/src/main/kotlin/org/springframework/boot/SpringApplicationExtensions.kt b/spring-boot-project/spring-boot/src/main/kotlin/org/springframework/boot/SpringApplicationExtensions.kt index 8a304615e2..c24e6ba264 100644 --- a/spring-boot-project/spring-boot/src/main/kotlin/org/springframework/boot/SpringApplicationExtensions.kt +++ b/spring-boot-project/spring-boot/src/main/kotlin/org/springframework/boot/SpringApplicationExtensions.kt @@ -42,16 +42,3 @@ inline fun runApplication(vararg args: String): ConfigurableAp */ inline fun 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>, vararg args: String, init: SpringApplication.() -> Unit = {}): ConfigurableApplicationContext = - SpringApplication(*primarySources.map { it.java }.toTypedArray()).apply(init).run(*args) diff --git a/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/SpringApplicationExtensionsTests.kt b/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/SpringApplicationExtensionsTests.kt index 261700c43d..c320a7d033 100644 --- a/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/SpringApplicationExtensionsTests.kt +++ b/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/SpringApplicationExtensionsTests.kt @@ -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() - 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() - assertArrayEquals(arrayOf("spring", "boot"), args.nonOptionArgs.toTypedArray()) - assertTrue(args.containsOption("debug")) - assertEquals(environment, context.environment) - } - @Configuration internal open class ExampleConfig