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

Fix removal of getLocalServiceInstance()

Browse Source
This commit is contained in:
Spencer Gibb
2017-10-30 18:25:22 -04:00
parent 35e2af7711
commit 5a1708185a
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-cloud-netflix-hystrix-stream/src/main/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamAutoConfiguration.java
View File

@@ -26,6 +26,7 @@ import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.actuator.HasFeatures;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClient;
import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryProperties;
import org.springframework.cloud.client.serviceregistry.Registration;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.annotation.Output;
@@ -100,10 +101,10 @@ public class HystrixStreamAutoConfiguration {
}
@Bean
public HystrixStreamTask hystrixStreamTask(SimpleDiscoveryClient simpleDiscoveryClient) {
public HystrixStreamTask hystrixStreamTask(SimpleDiscoveryProperties simpleDiscoveryProperties) {
ServiceInstance serviceInstance = this.registration;
if (serviceInstance == null) {
serviceInstance = simpleDiscoveryClient.getLocalServiceInstance();
serviceInstance = simpleDiscoveryProperties.getLocal();
}
return new HystrixStreamTask(this.outboundChannel, serviceInstance,
this.properties);

7
spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamAutoConfigurationNoRegistrationTests.java
View File

@@ -23,6 +23,7 @@ import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClient;
import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryProperties;
import org.springframework.cloud.client.serviceregistry.Registration;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit4.SpringRunner;
@@ -44,13 +45,13 @@ public class HystrixStreamAutoConfigurationNoRegistrationTests {
Registration registration;
@Autowired
SimpleDiscoveryClient simpleDiscoveryClient;
SimpleDiscoveryProperties simpleDiscoveryProperties;
@Test
public void withoutRegistrationWorks() throws Exception {
assertThat(this.registration).isNull();
assertThat(this.simpleDiscoveryClient).isNotNull();
assertThat(task.getRegistration()).isEqualTo(this.simpleDiscoveryClient.getLocalServiceInstance());
assertThat(this.simpleDiscoveryProperties).isNotNull();
assertThat(task.getRegistration()).isEqualTo(this.simpleDiscoveryProperties.getLocal());
}
@EnableAutoConfiguration