SpringCloud/spring-cloud-core-tests
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Dave Syer
2016-06-10 10:04:37 +01:00
parent 62f06d27e5
commit 179522de59
16 changed files with 88 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bus/src/test/java/demo/StandaloneClientApplicationTests.java
View File

@@ -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);
}
}

6
config-client-decrypt/src/test/java/demo/BootstrapDecryptionClientApplicationTests.java
View File

@@ -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);
}
}

3
config-client/src/test/java/demo/StandaloneClientApplicationTests.java
View File

@@ -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);
}
}

6
configserver-eureka/src/main/java/demo/ConfigServerEurekaApplication.java
View File

@@ -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);
}
}

3
eureka-client/src/test/java/demo/EurekaClientApplicationTests.java
View File

@@ -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);
}
}

6
eureka-first/src/main/java/demo/EurekaFirstApplication.java
View File

@@ -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);
}
}

32
hystrix/src/main/java/demo/HystrixApplication.java
View File

@@ -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);
}
}

6
netflix-sidecar/src/main/java/demo/SidecarApplication.java
View File

@@ -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);
}
}

4
oauth2-ribbon/src/main/java/demo/RibbonClientApplication.java
View File

@@ -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);
}

6
ribbon-default-config/src/main/java/demo/MyDefaultRibbonConfig.java
View File

@@ -35,11 +35,11 @@ public class MyDefaultRibbonConfig {
}
@Bean
public ServerListSubsetFilter serverListFilter() {
ServerListSubsetFilter filter = new ServerListSubsetFilter();
public ServerListSubsetFilter<Server> serverListFilter() {
ServerListSubsetFilter<Server> filter = new ServerListSubsetFilter<Server>();
return filter;
}
public static class BazServiceList extends ConfigurationBasedServerList {
public BazServiceList(IClientConfig config) {
super.initWithNiwsConfig(config);

49
ribbon-default-config/src/main/java/demo/RibbonDefaultConfigApplication.java
View File

@@ -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<Server> lb = (ZoneAwareLoadBalancer<Server>)clientFactory.getLoadBalancer("baz");
@PostConstruct
public void test() throws Exception {
@SuppressWarnings("unchecked")
ZoneAwareLoadBalancer<Server> lb = (ZoneAwareLoadBalancer<Server>) this.clientFactory.getLoadBalancer("baz");
ServerList<Server> serverList= lb.getServerListImpl();
if( !(serverList instanceof MyDefaultRibbonConfig.BazServiceList) ) {
throw new Exception("wrong server list type");
}
}
ServerList<Server> 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);
}
}

15
ribbon-default-config/src/test/java/demo/RibbonDefaultConfigApplicationTests.java
View File

@@ -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();
}
}

5
ribbon-eureka/src/main/java/demo/HelloClientApplication.java
View File

@@ -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) {

6
ribbon-eureka/src/test/java/apps/SimpleApplication.java
View File

@@ -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);
}
}
}

6
zuul-config-discovery/src/main/java/demo/ZuulConfigDiscoveryApplication.java
View File

@@ -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);
}
}

6
zuul-proxy-eureka/src/main/java/demo/ZuulProxyEurekaApplication.java
View File

@@ -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);
}
}