diff --git a/bus/src/test/java/demo/StandaloneClientApplicationTests.java b/bus/src/test/java/demo/StandaloneClientApplicationTests.java index e6ce69b..60a21cd 100644 --- a/bus/src/test/java/demo/StandaloneClientApplicationTests.java +++ b/bus/src/test/java/demo/StandaloneClientApplicationTests.java @@ -1,5 +1,7 @@ package demo; +import static org.junit.Assert.assertNotNull; + import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +22,7 @@ public class StandaloneClientApplicationTests { @Test public void contextLoads() throws Exception { + assertNotNull(this.locator); } } diff --git a/config-client-decrypt/src/test/java/demo/BootstrapDecryptionClientApplicationTests.java b/config-client-decrypt/src/test/java/demo/BootstrapDecryptionClientApplicationTests.java index 18ac37d..f99abb8 100644 --- a/config-client-decrypt/src/test/java/demo/BootstrapDecryptionClientApplicationTests.java +++ b/config-client-decrypt/src/test/java/demo/BootstrapDecryptionClientApplicationTests.java @@ -1,6 +1,7 @@ package demo; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import org.junit.Test; import org.junit.runner.RunWith; @@ -20,13 +21,14 @@ public class BootstrapDecryptionClientApplicationTests { @Autowired private ConfigClientProperties config; - + @Autowired private ConfigServicePropertySourceLocator locator; @Test public void contextLoads() throws Exception { - assertEquals("http://localhost:8888", config.getUri()); + assertEquals("http://localhost:8888", this.config.getUri()); + assertNotNull(this.locator); } } diff --git a/config-client/src/test/java/demo/StandaloneClientApplicationTests.java b/config-client/src/test/java/demo/StandaloneClientApplicationTests.java index e6ce69b..60a21cd 100644 --- a/config-client/src/test/java/demo/StandaloneClientApplicationTests.java +++ b/config-client/src/test/java/demo/StandaloneClientApplicationTests.java @@ -1,5 +1,7 @@ package demo; +import static org.junit.Assert.assertNotNull; + import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +22,7 @@ public class StandaloneClientApplicationTests { @Test public void contextLoads() throws Exception { + assertNotNull(this.locator); } } diff --git a/configserver-eureka/src/main/java/demo/ConfigServerEurekaApplication.java b/configserver-eureka/src/main/java/demo/ConfigServerEurekaApplication.java index 5cf2d05..8cf43b4 100644 --- a/configserver-eureka/src/main/java/demo/ConfigServerEurekaApplication.java +++ b/configserver-eureka/src/main/java/demo/ConfigServerEurekaApplication.java @@ -10,8 +10,8 @@ import org.springframework.cloud.netflix.eureka.EnableEurekaClient; @EnableEurekaClient public class ConfigServerEurekaApplication { - public static void main(String[] args) { - SpringApplication.run(ConfigServerEurekaApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(ConfigServerEurekaApplication.class, args); + } } diff --git a/eureka-client/src/test/java/demo/EurekaClientApplicationTests.java b/eureka-client/src/test/java/demo/EurekaClientApplicationTests.java index d956c20..11b432d 100644 --- a/eureka-client/src/test/java/demo/EurekaClientApplicationTests.java +++ b/eureka-client/src/test/java/demo/EurekaClientApplicationTests.java @@ -1,5 +1,7 @@ package demo; +import static org.junit.Assert.assertNotNull; + import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +22,7 @@ public class EurekaClientApplicationTests { @Test public void contextLoads() throws Exception { + assertNotNull(this.client); } } diff --git a/eureka-first/src/main/java/demo/EurekaFirstApplication.java b/eureka-first/src/main/java/demo/EurekaFirstApplication.java index 7cf9aba..50c6f7d 100644 --- a/eureka-first/src/main/java/demo/EurekaFirstApplication.java +++ b/eureka-first/src/main/java/demo/EurekaFirstApplication.java @@ -8,7 +8,7 @@ import org.springframework.cloud.client.discovery.EnableDiscoveryClient; @EnableDiscoveryClient public class EurekaFirstApplication { - public static void main(String[] args) { - SpringApplication.run(EurekaFirstApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(EurekaFirstApplication.class, args); + } } diff --git a/hystrix/src/main/java/demo/HystrixApplication.java b/hystrix/src/main/java/demo/HystrixApplication.java index d7a22e1..ff0987e 100644 --- a/hystrix/src/main/java/demo/HystrixApplication.java +++ b/hystrix/src/main/java/demo/HystrixApplication.java @@ -17,25 +17,25 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class HystrixApplication { - @Bean - public MyService myService() { - return new MyService(); - } + @Bean + public MyService myService() { + return new MyService(); + } - @Autowired - private MyService myService; + @Autowired + private MyService myService; - @RequestMapping("/") - public String ok() { - return myService.ok(); - } + @RequestMapping("/") + public String ok() { + return this.myService.ok(); + } - @RequestMapping("/fail") - public String fail() { - return myService.fail(); - } + @RequestMapping("/fail") + public String fail() { + return this.myService.fail(); + } public static void main(String[] args) { - SpringApplication.run(HystrixApplication.class, args); - } + SpringApplication.run(HystrixApplication.class, args); + } } diff --git a/netflix-sidecar/src/main/java/demo/SidecarApplication.java b/netflix-sidecar/src/main/java/demo/SidecarApplication.java index 050fb95..b97c49b 100644 --- a/netflix-sidecar/src/main/java/demo/SidecarApplication.java +++ b/netflix-sidecar/src/main/java/demo/SidecarApplication.java @@ -8,7 +8,7 @@ import org.springframework.cloud.netflix.sidecar.EnableSidecar; @EnableSidecar public class SidecarApplication { - public static void main(String[] args) { - SpringApplication.run(SidecarApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SidecarApplication.class, args); + } } diff --git a/oauth2-ribbon/src/main/java/demo/RibbonClientApplication.java b/oauth2-ribbon/src/main/java/demo/RibbonClientApplication.java index be7c6a9..548298d 100644 --- a/oauth2-ribbon/src/main/java/demo/RibbonClientApplication.java +++ b/oauth2-ribbon/src/main/java/demo/RibbonClientApplication.java @@ -19,8 +19,8 @@ public class RibbonClientApplication { @LoadBalanced @Bean - public OAuth2RestTemplate loadBalancedOauth2RestTemplate( - OAuth2ProtectedResourceDetails resource, OAuth2ClientContext context) { + public OAuth2RestTemplate loadBalancedOauth2RestTemplate(OAuth2ProtectedResourceDetails resource, + OAuth2ClientContext context) { return new OAuth2RestTemplate(resource, context); } diff --git a/ribbon-default-config/src/main/java/demo/MyDefaultRibbonConfig.java b/ribbon-default-config/src/main/java/demo/MyDefaultRibbonConfig.java index 9237c10..134aa9f 100644 --- a/ribbon-default-config/src/main/java/demo/MyDefaultRibbonConfig.java +++ b/ribbon-default-config/src/main/java/demo/MyDefaultRibbonConfig.java @@ -35,11 +35,11 @@ public class MyDefaultRibbonConfig { } @Bean - public ServerListSubsetFilter serverListFilter() { - ServerListSubsetFilter filter = new ServerListSubsetFilter(); + public ServerListSubsetFilter serverListFilter() { + ServerListSubsetFilter filter = new ServerListSubsetFilter(); return filter; } - + public static class BazServiceList extends ConfigurationBasedServerList { public BazServiceList(IClientConfig config) { super.initWithNiwsConfig(config); diff --git a/ribbon-default-config/src/main/java/demo/RibbonDefaultConfigApplication.java b/ribbon-default-config/src/main/java/demo/RibbonDefaultConfigApplication.java index 1e16309..edd93d9 100644 --- a/ribbon-default-config/src/main/java/demo/RibbonDefaultConfigApplication.java +++ b/ribbon-default-config/src/main/java/demo/RibbonDefaultConfigApplication.java @@ -20,15 +20,12 @@ import com.netflix.loadbalancer.ZoneAwareLoadBalancer; * @author brenuart */ @ComponentScan( - // Exclude @Configuration classes that should be included only in sub contexts created - // by Ribbon's SpringClientFactory. - excludeFilters={ - @ComponentScan.Filter(type=FilterType.REGEX, pattern=".*RibbonConfig") - } - ) +// Exclude @Configuration classes that should be included only in sub contexts created +// by Ribbon's SpringClientFactory. +excludeFilters = { @ComponentScan.Filter(type = FilterType.REGEX, pattern = ".*RibbonConfig") }) @SpringBootApplication -@RibbonClients(defaultConfiguration=MyDefaultRibbonConfig.class) +@RibbonClients(defaultConfiguration = MyDefaultRibbonConfig.class) @Configuration public class RibbonDefaultConfigApplication { @@ -36,28 +33,26 @@ public class RibbonDefaultConfigApplication { private SpringClientFactory clientFactory; /** - * Throws exception if the SpringClientFactory doesn't return a balancer with a server list - * of the expected type. + * Throws exception if the SpringClientFactory doesn't return a balancer with a server + * list of the expected type. * */ - @PostConstruct - public void test() throws Exception { - ZoneAwareLoadBalancer lb = (ZoneAwareLoadBalancer)clientFactory.getLoadBalancer("baz"); + @PostConstruct + public void test() throws Exception { + @SuppressWarnings("unchecked") + ZoneAwareLoadBalancer lb = (ZoneAwareLoadBalancer) this.clientFactory.getLoadBalancer("baz"); - ServerList serverList= lb.getServerListImpl(); - if( !(serverList instanceof MyDefaultRibbonConfig.BazServiceList) ) { - throw new Exception("wrong server list type"); - } - } + ServerList serverList = lb.getServerListImpl(); + if (!(serverList instanceof MyDefaultRibbonConfig.BazServiceList)) { + throw new Exception("wrong server list type"); + } + } - - - /** - * @param args - */ - public static void main(String[] args) { - SpringApplication app = new SpringApplicationBuilder(RibbonDefaultConfigApplication.class).build(); - app.run(args); - } + /** + * @param args + */ + public static void main(String[] args) { + SpringApplication app = new SpringApplicationBuilder(RibbonDefaultConfigApplication.class).build(); + app.run(args); + } } - diff --git a/ribbon-default-config/src/test/java/demo/RibbonDefaultConfigApplicationTests.java b/ribbon-default-config/src/test/java/demo/RibbonDefaultConfigApplicationTests.java index be56252..f404136 100644 --- a/ribbon-default-config/src/test/java/demo/RibbonDefaultConfigApplicationTests.java +++ b/ribbon-default-config/src/test/java/demo/RibbonDefaultConfigApplicationTests.java @@ -17,15 +17,22 @@ package demo; import org.junit.Test; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.builder.SpringApplicationBuilder; +import org.junit.runner.RunWith; +import org.springframework.boot.test.IntegrationTest; +import org.springframework.boot.test.SpringApplicationConfiguration; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.web.WebAppConfiguration; +@RunWith(SpringJUnit4ClassRunner.class) +@SpringApplicationConfiguration(classes = RibbonDefaultConfigApplication.class) +@WebAppConfiguration +@IntegrationTest("server.port=0") +@DirtiesContext public class RibbonDefaultConfigApplicationTests { @Test public void contextLoads() { - SpringApplication app = new SpringApplicationBuilder(RibbonDefaultConfigApplication.class).build(); - app.run(); } } diff --git a/ribbon-eureka/src/main/java/demo/HelloClientApplication.java b/ribbon-eureka/src/main/java/demo/HelloClientApplication.java index 2c3298e..ca62523 100644 --- a/ribbon-eureka/src/main/java/demo/HelloClientApplication.java +++ b/ribbon-eureka/src/main/java/demo/HelloClientApplication.java @@ -17,12 +17,13 @@ import org.springframework.web.client.RestTemplate; @EnableDiscoveryClient @RestController public class HelloClientApplication { + @Autowired - RestTemplate client; + private RestTemplate client; @RequestMapping("/") public String hello() { - return client.getForObject("http://simple/", String.class); + return this.client.getForObject("http://simple/", String.class); } public static void main(String[] args) { diff --git a/ribbon-eureka/src/test/java/apps/SimpleApplication.java b/ribbon-eureka/src/test/java/apps/SimpleApplication.java index d45b119..e3e9a91 100644 --- a/ribbon-eureka/src/test/java/apps/SimpleApplication.java +++ b/ribbon-eureka/src/test/java/apps/SimpleApplication.java @@ -28,14 +28,14 @@ import org.springframework.web.bind.annotation.RestController; @EnableDiscoveryClient @RestController public class SimpleApplication { - + @RequestMapping("/") public String hello() { return "Hello"; } - + public static void main(String[] args) { new SpringApplicationBuilder(SimpleApplication.class).properties( "spring.config.name:simple").run(args); - } + } } diff --git a/zuul-config-discovery/src/main/java/demo/ZuulConfigDiscoveryApplication.java b/zuul-config-discovery/src/main/java/demo/ZuulConfigDiscoveryApplication.java index 6dee793..f58a35a 100755 --- a/zuul-config-discovery/src/main/java/demo/ZuulConfigDiscoveryApplication.java +++ b/zuul-config-discovery/src/main/java/demo/ZuulConfigDiscoveryApplication.java @@ -8,8 +8,8 @@ import org.springframework.cloud.netflix.zuul.EnableZuulProxy; @EnableZuulProxy public class ZuulConfigDiscoveryApplication { - public static void main(String[] args) { - new SpringApplicationBuilder(ZuulConfigDiscoveryApplication.class).web(true).run(args); - } + public static void main(String[] args) { + new SpringApplicationBuilder(ZuulConfigDiscoveryApplication.class).web(true).run(args); + } } diff --git a/zuul-proxy-eureka/src/main/java/demo/ZuulProxyEurekaApplication.java b/zuul-proxy-eureka/src/main/java/demo/ZuulProxyEurekaApplication.java index 2e7ac9d..d0f845e 100644 --- a/zuul-proxy-eureka/src/main/java/demo/ZuulProxyEurekaApplication.java +++ b/zuul-proxy-eureka/src/main/java/demo/ZuulProxyEurekaApplication.java @@ -8,7 +8,7 @@ import org.springframework.cloud.netflix.zuul.EnableZuulProxy; @EnableZuulProxy public class ZuulProxyEurekaApplication { - public static void main(String[] args) { - SpringApplication.run(ZuulProxyEurekaApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(ZuulProxyEurekaApplication.class, args); + } }