Browse Source

Polish

pull/118/merge
Phillip Webb 12 years ago
parent
commit
bec1c8f00f
  1. 1
      spring-boot-cli/samples/failures.groovy
  2. 2
      spring-boot-cli/samples/jms.groovy
  3. 2
      spring-boot-cli/samples/job.groovy
  4. 1
      spring-boot-cli/samples/rabbit.groovy
  5. 2
      spring-boot-cli/samples/reactor.groovy
  6. 2
      spring-boot-cli/samples/runner.groovy
  7. 2
      spring-boot-cli/samples/template.groovy
  8. 1
      spring-boot-cli/samples/tx.groovy
  9. 2
      spring-boot-cli/samples/web.groovy
  10. 7
      spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java

1
spring-boot-cli/samples/failures.groovy

@ -33,5 +33,4 @@ class FailingSpockTest extends Specification { @@ -33,5 +33,4 @@ class FailingSpockTest extends Specification {
//throw new RuntimeException("This should fail!")
true == false
}
}

2
spring-boot-cli/samples/jms.groovy

@ -34,13 +34,11 @@ class JmsExample implements CommandLineRunner { @@ -34,13 +34,11 @@ class JmsExample implements CommandLineRunner {
jmsTemplate.send("spring-boot", messageCreator)
latch.await()
}
}
@Log
class Receiver {
CountDownLatch latch
def receive(String message) {
log.info "Received ${message}"
latch.countDown()

2
spring-boot-cli/samples/job.groovy

@ -31,5 +31,3 @@ class JobConfig { @@ -31,5 +31,3 @@ class JobConfig {
return steps.get("step1").tasklet(tasklet()).build()
}
}

1
spring-boot-cli/samples/rabbit.groovy

@ -50,7 +50,6 @@ class RabbitExample implements CommandLineRunner { @@ -50,7 +50,6 @@ class RabbitExample implements CommandLineRunner {
rabbitTemplate.convertAndSend(queueName, "Greetings from Spring Boot via RabbitMQ")
latch.await()
}
}
@Log

2
spring-boot-cli/samples/reactor.groovy

@ -28,5 +28,3 @@ class Runner implements CommandLineRunner { @@ -28,5 +28,3 @@ class Runner implements CommandLineRunner {
latch.countDown()
}
}

2
spring-boot-cli/samples/runner.groovy

@ -6,5 +6,3 @@ class Runner implements CommandLineRunner { @@ -6,5 +6,3 @@ class Runner implements CommandLineRunner {
print "Hello World!"
}
}

2
spring-boot-cli/samples/template.groovy

@ -21,5 +21,3 @@ class MyService { @@ -21,5 +21,3 @@ class MyService {
return "World"
}
}

1
spring-boot-cli/samples/tx.groovy

@ -13,6 +13,5 @@ class Example implements CommandLineRunner { @@ -13,6 +13,5 @@ class Example implements CommandLineRunner {
void run(String... args) {
println "Foo count=" + jdbcTemplate.queryForObject("SELECT COUNT(*) from FOO", Integer)
}
}

2
spring-boot-cli/samples/web.groovy

@ -19,5 +19,3 @@ class MyService { @@ -19,5 +19,3 @@ class MyService {
return "World!";
}
}

7
spring-boot/src/main/java/org/springframework/boot/builder/SpringApplicationBuilder.java

@ -63,12 +63,19 @@ import org.springframework.core.io.ResourceLoader; @@ -63,12 +63,19 @@ import org.springframework.core.io.ResourceLoader;
public class SpringApplicationBuilder {
private SpringApplication application;
private ConfigurableApplicationContext context;
private SpringApplicationBuilder parent;
private AtomicBoolean running = new AtomicBoolean(false);
private Set<Object> sources = new LinkedHashSet<Object>();
private Map<String, Object> defaultProperties = new LinkedHashMap<String, Object>();
private ConfigurableEnvironment environment;
private Set<String> additionalProfiles = new LinkedHashSet<String>();
private Set<ApplicationContextInitializer<?>> initializers = new LinkedHashSet<ApplicationContextInitializer<?>>();

Loading…
Cancel
Save