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

Updated to sc-zookeeper changes

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-01-12 15:11:22 +01:00
parent 9644b0b790
commit 2808d3eb2e
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/spring/cloud/zookeeper/StubRunnerSpringCloudZookeeperAutoConfiguration.java
View File

@@ -18,7 +18,6 @@ package org.springframework.cloud.contract.stubrunner.spring.cloud.zookeeper;
import org.apache.curator.framework.CuratorFramework;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.contract.stubrunner.StubRunning;
@@ -26,7 +25,9 @@ import org.springframework.cloud.contract.stubrunner.spring.StubRunnerConfigurat
import org.springframework.cloud.contract.stubrunner.spring.cloud.ConditionalOnStubbedDiscoveryDisabled;
import org.springframework.cloud.contract.stubrunner.spring.cloud.StubMapperProperties;
import org.springframework.cloud.contract.stubrunner.spring.cloud.StubsRegistrar;
import org.springframework.cloud.zookeeper.discovery.ConditionalOnZookeeperDiscoveryEnabled;
import org.springframework.cloud.zookeeper.discovery.ZookeeperDiscoveryProperties;
import org.springframework.cloud.zookeeper.support.CuratorServiceDiscoveryAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -38,10 +39,10 @@ import org.springframework.context.annotation.Configuration;
* @since 1.0.0
*/
@Configuration
@AutoConfigureAfter(StubRunnerConfiguration.class)
@ConditionalOnBean({ CuratorFramework.class, ZookeeperDiscoveryProperties.class})
@AutoConfigureAfter({ StubRunnerConfiguration.class, CuratorServiceDiscoveryAutoConfiguration.class })
@ConditionalOnClass(org.apache.curator.x.discovery.ServiceInstance.class)
@ConditionalOnStubbedDiscoveryDisabled
@ConditionalOnZookeeperDiscoveryEnabled
@ConditionalOnProperty(value = "stubrunner.cloud.zookeeper.enabled", matchIfMissing = true)
public class StubRunnerSpringCloudZookeeperAutoConfiguration {

10
tests/spring-cloud-contract-stub-runner-boot-zookeeper/src/test/groovy/org/springframework/cloud/contract/stubrunner/spring/cloud/zookeeper/StubRunnerSpringCloudZookeeperAutoConfigurationSpec.groovy
View File

@@ -60,8 +60,8 @@ class StubRunnerSpringCloudZookeeperAutoConfigurationSpec extends Specification
@BeforeClass
@AfterClass
static void setupProps() {
System.clearProperty("stubrunner.stubs.repository.root");
System.clearProperty("stubrunner.stubs.classifier");
System.clearProperty("stubrunner.stubs.repository.root")
System.clearProperty("stubrunner.stubs.classifier")
}
def 'should make service discovery work'() {
@@ -75,12 +75,12 @@ class StubRunnerSpringCloudZookeeperAutoConfigurationSpec extends Specification
def 'should have all apps registered in Service Discovery'() {
expect:
!zookeeperServiceDiscovery.getServiceDiscovery().queryForInstances('loanIssuance').empty
!zookeeperServiceDiscovery.getServiceDiscovery().queryForInstances('someNameThatShouldMapFraudDetectionServer').empty
!zookeeperServiceDiscovery.serviceDiscoveryRef.get().queryForInstances('loanIssuance').empty
!zookeeperServiceDiscovery.serviceDiscoveryRef.get().queryForInstances('someNameThatShouldMapFraudDetectionServer').empty
}
def cleanup() {
zookeeperServiceDiscovery?.serviceDiscovery?.close()
zookeeperServiceDiscovery?.serviceDiscoveryRef?.get()?.close()
}
@Configuration