From 5a1708185a5e16b726caa5ea03b139449d6b2ff1 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Mon, 30 Oct 2017 18:25:22 -0400
Subject: [PATCH] Fix removal of getLocalServiceInstance()

---
 .../hystrix/stream/HystrixStreamAutoConfiguration.java     | 5 +++--
 .../HystrixStreamAutoConfigurationNoRegistrationTests.java | 7 ++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-netflix-hystrix-stream/src/main/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamAutoConfiguration.java b/spring-cloud-netflix-hystrix-stream/src/main/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamAutoConfiguration.java
index f1eaf921..2bca33d1 100644
--- a/spring-cloud-netflix-hystrix-stream/src/main/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamAutoConfiguration.java
+++ b/spring-cloud-netflix-hystrix-stream/src/main/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamAutoConfiguration.java
@@ -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);
diff --git a/spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamAutoConfigurationNoRegistrationTests.java b/spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamAutoConfigurationNoRegistrationTests.java
index dc18ccb8..4f9dccdd 100644
--- a/spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamAutoConfigurationNoRegistrationTests.java
+++ b/spring-cloud-netflix-hystrix-stream/src/test/java/org/springframework/cloud/netflix/hystrix/stream/HystrixStreamAutoConfigurationNoRegistrationTests.java
@@ -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