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

[bs-47] Add default command line args to SpringApplication

Browse Source 
* See SpringApplication.setDefaultCommandLineArgs
* Assumes command line is in "simple" form (TODO: if we
need JOpt etc. support then the command line args parsing from
Spring needs to be exposed)
* If defaults are provided the command line might be re-ordered
slightly (non-option args come after option args)
* Allows custom application.properties file names to be specified
as a side effect (--spring.config.name=... or
--spring.config.location=...}.

[Fixes #48284369]
This commit is contained in:
Dave Syer
2013-04-26 09:47:10 +01:00
parent 61fa55b524
commit d6a670e13e
2 changed files with 100 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
spring-bootstrap/src/test/java/org/springframework/bootstrap/SpringApplicationTests.java
View File

@@ -24,6 +24,7 @@ import org.springframework.beans.BeansException;
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanNameGenerator;
import org.springframework.beans.factory.support.DefaultBeanNameGenerator;
import org.springframework.bootstrap.context.annotation.EnableAutoConfiguration;
import org.springframework.bootstrap.context.embedded.AnnotationConfigEmbeddedWebApplicationContext;
import org.springframework.bootstrap.context.embedded.jetty.JettyEmbeddedServletContainerFactory;
import org.springframework.context.ApplicationContext;
@@ -37,6 +38,7 @@ import org.springframework.context.support.StaticApplicationContext;
import org.springframework.core.Ordered;
import org.springframework.core.env.CommandLinePropertySource;
import org.springframework.core.env.ConfigurableEnvironment;
import org.springframework.core.env.Environment;
import org.springframework.core.env.PropertySource;
import org.springframework.core.env.StandardEnvironment;
import org.springframework.core.io.DefaultResourceLoader;
@@ -67,6 +69,13 @@ public class SpringApplicationTests {
private ApplicationContext context;
private Environment getEnvironment() {
if (this.context instanceof ConfigurableApplicationContext) {
return ((ConfigurableApplicationContext) this.context).getEnvironment();
}
throw new IllegalStateException("No Environment available");
}
@After
public void close() {
if (this.context instanceof ConfigurableApplicationContext) {
@@ -250,6 +259,17 @@ public class SpringApplicationTests {
assertNotNull(this.context);
}
@Test
public void defaultCommandLineArgs() throws Exception {
SpringApplication application = new SpringApplication(ExampleConfig.class);
application.setDefaultCommandLineArgs("--foo", "--bar=spam", "bucket");
application.setWebEnvironment(false);
this.context = application.run("--bar=foo", "bucket", "crap");
assertThat(this.context, instanceOf(AnnotationConfigApplicationContext.class));
assertThat(getEnvironment().getProperty("bar"), equalTo("foo"));
assertThat(getEnvironment().getProperty("foo"), equalTo(""));
}
private boolean hasPropertySource(ConfigurableEnvironment environment,
Class<?> propertySourceClass) {
for (PropertySource<?> source : environment.getPropertySources()) {
@@ -311,6 +331,7 @@ public class SpringApplicationTests {
}
@Configuration
@EnableAutoConfiguration
static class ExampleWebConfig {
@Bean