diff --git a/spring-boot-cli/samples/http.groovy b/spring-boot-cli/samples/http.groovy new file mode 100644 index 00000000000..e83ab09b924 --- /dev/null +++ b/spring-boot-cli/samples/http.groovy @@ -0,0 +1,19 @@ +package org.test + +@Grab("org.codehaus.groovy.modules.http-builder:http-builder:0.5.2") // This one just to test dependency resolution +import groovyx.net.http.* + +@Controller +class Example implements CommandLineRunner { + + @RequestMapping("/") + @ResponseBody + public String helloWorld() { + return "World!" + } + + void run(String... args) { + def world = new RESTClient("http://localhost:8080").get(path:"/").data.text + print "Hello " + world + } +} diff --git a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GrapeEngineCustomizer.java b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GrapeEngineCustomizer.java index 16a6a6863eb..4780cfd5dd9 100644 --- a/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GrapeEngineCustomizer.java +++ b/spring-boot-cli/src/main/java/org/springframework/boot/cli/compiler/GrapeEngineCustomizer.java @@ -83,6 +83,7 @@ class GrapeEngineCustomizer { SpringBootResolver springBootResolver = new SpringBootResolver( grapesResolver.getResolvers()); springBootResolver.setSettings(settings); + springBootResolver.setReturnFirst(grapesResolver.isReturnFirst()); springBootResolver.setName("springBoot"); if (!Boolean.getBoolean("disableSpringSnapshotRepos")) { diff --git a/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java b/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java index 19482c6fc1f..13cba880ada 100644 --- a/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java +++ b/spring-boot-cli/src/test/java/org/springframework/boot/cli/SampleIntegrationTests.java @@ -155,6 +155,13 @@ public class SampleIntegrationTests { assertEquals("{\"message\":\"Hello World!\"}", result); } + @Test + public void httpSample() throws Exception { + start("samples/http.groovy"); + String output = this.outputCapture.getOutputAndRelease(); + assertTrue("Wrong output: " + output, output.contains("Hello World")); + } + @Test public void integrationSample() throws Exception { start("samples/integration.groovy"); diff --git a/spring-boot-cli/src/test/resources/logback.xml b/spring-boot-cli/src/test/resources/logback.xml index 91bcaffa1d0..c0f98c6ae8d 100644 --- a/spring-boot-cli/src/test/resources/logback.xml +++ b/spring-boot-cli/src/test/resources/logback.xml @@ -1,19 +1,5 @@ - - - - - - - ${CONSOLE_LOG_PATTERN} - - - - - - - - - + +