diff --git a/README.md b/README.md new file mode 100644 index 0000000..7d6e668 --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +Integration test projects for Spring Cloud. Not necessarily full demo +or sample apps, but each one implementing a single scenario or small +set of scenarios. Very useful for testing classpath combinations +(e.g. making sure that optional depednencies really are optional). diff --git a/zuul-proxy/src/main/java/demo/DemoApplication.java b/zuul-proxy/src/main/java/demo/ZuulProxyApplication.java similarity index 54% rename from zuul-proxy/src/main/java/demo/DemoApplication.java rename to zuul-proxy/src/main/java/demo/ZuulProxyApplication.java index da3bba4..729285e 100644 --- a/zuul-proxy/src/main/java/demo/DemoApplication.java +++ b/zuul-proxy/src/main/java/demo/ZuulProxyApplication.java @@ -2,11 +2,13 @@ package demo; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.cloud.netflix.zuul.EnableZuulProxy; @SpringBootApplication -public class DemoApplication { +@EnableZuulProxy +public class ZuulProxyApplication { public static void main(String[] args) { - SpringApplication.run(DemoApplication.class, args); + SpringApplication.run(ZuulProxyApplication.class, args); } } diff --git a/zuul-proxy/src/test/java/demo/DemoApplicationTests.java b/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java similarity index 72% rename from zuul-proxy/src/test/java/demo/DemoApplicationTests.java rename to zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java index ad7230b..d665c4c 100644 --- a/zuul-proxy/src/test/java/demo/DemoApplicationTests.java +++ b/zuul-proxy/src/test/java/demo/ZuulProxyApplicationTests.java @@ -6,8 +6,8 @@ import org.springframework.boot.test.SpringApplicationConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) -@SpringApplicationConfiguration(classes = DemoApplication.class) -public class DemoApplicationTests { +@SpringApplicationConfiguration(classes = ZuulProxyApplication.class) +public class ZuulProxyApplicationTests { @Test public void contextLoads() {