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

Migrated DependencyConfig to Java

Browse Source
This commit is contained in:
Marcin Grzejszczak
2016-04-28 10:08:14 +02:00
parent a7d3d4f6b4
commit d0465d7d9b
5 changed files with 121 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@@ -191,6 +191,12 @@
<artifactId>groovy-all</artifactId>
<version>2.4.4</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<version>2.4.0</version>
<scope>test</scope>
</dependency>
</dependencies>
</dependencyManagement>

5
spring-cloud-zookeeper-discovery/pom.xml
View File

@@ -159,6 +159,11 @@
<scope>test</scope>
<version>1.53</version>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project>

104
spring-cloud-zookeeper-discovery/src/test/groovy/org/springframework/cloud/zookeeper/discovery/dependency/DependencyConfig.groovy
View File

@@ -1,104 +0,0 @@
package org.springframework.cloud.zookeeper.discovery.dependency
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.boot.actuate.autoconfigure.EndpointMBeanExportAutoConfiguration
import org.springframework.boot.autoconfigure.EnableAutoConfiguration
import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent
import org.springframework.cloud.client.discovery.EnableDiscoveryClient
import org.springframework.cloud.client.loadbalancer.LoadBalanced
import org.springframework.cloud.netflix.feign.EnableFeignClients
import org.springframework.cloud.netflix.feign.FeignClient
import org.springframework.cloud.zookeeper.discovery.ZookeeperServiceDiscovery
import org.springframework.cloud.zookeeper.discovery.test.CommonTestConfig
import org.springframework.cloud.zookeeper.discovery.test.TestRibbonClient
import org.springframework.context.ApplicationListener
import org.springframework.context.annotation.Bean
import org.springframework.context.annotation.Configuration
import org.springframework.context.annotation.Import
import org.springframework.web.bind.annotation.RequestHeader
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RequestMethod
import org.springframework.web.bind.annotation.RestController
import org.springframework.web.client.RestTemplate
@Configuration
@EnableAutoConfiguration(exclude = [EndpointMBeanExportAutoConfiguration])
@Import(CommonTestConfig)
@EnableDiscoveryClient
@EnableFeignClients(basePackageClasses = [AliasUsingFeignClient, IdUsingFeignClient])
class DependencyConfig {
@Autowired ZookeeperServiceDiscovery zookeeperServiceDiscovery
@Bean
TestRibbonClient testRibbonClient(@LoadBalanced RestTemplate restTemplate) {
return new TestRibbonClient(restTemplate)
}
@Bean
PingController pingController() {
return new PingController(portListener())
}
@Bean
PortListener portListener() {
return new PortListener()
}
}
class PortListener implements ApplicationListener<EmbeddedServletContainerInitializedEvent> {
private int port
@Override
public void onApplicationEvent(EmbeddedServletContainerInitializedEvent event) {
this.port = event.getEmbeddedServletContainer().getPort()
}
public int getPort() {
return port
}
}
@FeignClient("someAlias")
interface AliasUsingFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/beans")
String getBeans()
@RequestMapping(method = RequestMethod.GET, value = "/checkHeaders")
String checkHeaders()
}
@FeignClient("nameWithoutAlias")
interface IdUsingFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/beans")
String getBeans()
}
@RestController
class PingController {
private final PortListener portListener
PingController(PortListener portListener) {
this.portListener = portListener
}
@RequestMapping('/ping') String ping() {
return 'pong'
}
@RequestMapping('/port') Integer port() {
return portListener.port
}
@RequestMapping('/checkHeaders') String checkHeaders(@RequestHeader('Content-Type') String contentType,
@RequestHeader('header1') Collection<String> header1,
@RequestHeader('header2') Collection<String> header2) {
assert contentType == 'application/vnd.newsletter.v1+json'
assert header1 == ['value1'] as Set
assert header2 == ['value2'] as Set
return 'ok'
}
}

106
spring-cloud-zookeeper-discovery/src/test/groovy/org/springframework/cloud/zookeeper/discovery/dependency/DependencyConfig.java Normal file
View File

@@ -0,0 +1,106 @@
package org.springframework.cloud.zookeeper.discovery.dependency;
import java.util.Collection;
import org.springframework.boot.actuate.autoconfigure.EndpointMBeanExportAutoConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.cloud.netflix.feign.EnableFeignClients;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.cloud.zookeeper.discovery.test.CommonTestConfig;
import org.springframework.cloud.zookeeper.discovery.test.TestRibbonClient;
import org.springframework.context.ApplicationListener;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.client.RestTemplate;
import static org.assertj.core.api.BDDAssertions.then;
@Configuration
@EnableAutoConfiguration(exclude = EndpointMBeanExportAutoConfiguration.class)
@Import(CommonTestConfig.class)
@EnableDiscoveryClient
@EnableFeignClients(basePackageClasses = {AliasUsingFeignClient.class, IdUsingFeignClient.class})
public class DependencyConfig {
@Bean
TestRibbonClient testRibbonClient(@LoadBalanced RestTemplate restTemplate) {
return new TestRibbonClient(restTemplate);
}
@Bean
PingController pingController() {
return new PingController(portListener());
}
@Bean
PortListener portListener() {
return new PortListener();
}
}
class PortListener implements ApplicationListener<EmbeddedServletContainerInitializedEvent> {
private int port;
@Override
public void onApplicationEvent(EmbeddedServletContainerInitializedEvent event) {
this.port = event.getEmbeddedServletContainer().getPort();
}
public int getPort() {
return this.port;
}
}
@FeignClient("someAlias")
interface AliasUsingFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/beans")
String getBeans();
@RequestMapping(method = RequestMethod.GET, value = "/checkHeaders")
String checkHeaders();
}
@FeignClient("nameWithoutAlias")
interface IdUsingFeignClient {
@RequestMapping(method = RequestMethod.GET, value = "/beans")
String getBeans();
}
@RestController
class PingController {
private final PortListener portListener;
PingController(PortListener portListener) {
this.portListener = portListener;
}
@RequestMapping("/ping") String ping() {
return "pong";
}
@RequestMapping("/port") Integer port() {
return this.portListener.getPort();
}
@RequestMapping("/checkHeaders") String checkHeaders(@RequestHeader("Content-Type") String contentType,
@RequestHeader("header1")
Collection<String> header1,
@RequestHeader("header2") Collection<String> header2) {
then(contentType).isEqualTo("application/vnd.newsletter.v1+json");
then(header1).containsExactly("value1");
then(header2).containsExactly("value2");
return "ok";
}
}

8
spring-cloud-zookeeper-discovery/src/test/groovy/org/springframework/cloud/zookeeper/discovery/test/TestRibbonClient.java
View File

@@ -9,22 +9,22 @@ public class TestRibbonClient extends TestServiceRestClient {
private final String thisAppName;
TestRibbonClient(RestTemplate restTemplate) {
public TestRibbonClient(RestTemplate restTemplate) {
super(restTemplate);
this.thisAppName = "someName";
}
TestRibbonClient(RestTemplate restTemplate, String thisAppName) {
public TestRibbonClient(RestTemplate restTemplate, String thisAppName) {
super(restTemplate);
this.thisAppName = thisAppName;
}
String thisHealthCheck() {
public String thisHealthCheck() {
return this.restTemplate
.getForObject("http://" + this.thisAppName + "/health", String.class);
}
Integer thisPort() {
public Integer thisPort() {
return this.restTemplate
.getForObject("http://" + this.thisAppName + "/port", Integer.class);
}