From aeb2ee0e124c908b935fd142682be59e04e3633f Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Fri, 1 Apr 2016 15:39:03 -0600
Subject: [PATCH] Use new ContextRefresher rather than RefreshEndpoint.

---
 .../cloud/bus/BusAutoConfiguration.java           |  8 ++++----
 .../cloud/bus/event/RefreshListener.java          | 15 +++++++--------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java
index 4155f0b..aa5077a 100644
--- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java
+++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/BusAutoConfiguration.java
@@ -20,8 +20,8 @@ import org.springframework.cloud.bus.event.RemoteApplicationEvent;
 import org.springframework.cloud.bus.event.SentApplicationEvent;
 import org.springframework.cloud.bus.event.TraceListener;
 import org.springframework.cloud.context.environment.EnvironmentManager;
+import org.springframework.cloud.context.refresh.ContextRefresher;
 import org.springframework.cloud.context.scope.refresh.RefreshScope;
-import org.springframework.cloud.endpoint.RefreshEndpoint;
 import org.springframework.cloud.stream.annotation.EnableBinding;
 import org.springframework.cloud.stream.annotation.Output;
 import org.springframework.cloud.stream.config.BindingProperties;
@@ -170,13 +170,13 @@ public class BusAutoConfiguration implements ApplicationEventPublisherAware {
 
 	@Configuration
 	@ConditionalOnClass({ Endpoint.class, RefreshScope.class })
-	@ConditionalOnBean(RefreshEndpoint.class)
+	@ConditionalOnBean(ContextRefresher.class)
 	protected static class BusRefreshConfiguration {
 
 		@Bean
 		@ConditionalOnProperty(value = "spring.cloud.bus.refresh.enabled", matchIfMissing = true)
-		public RefreshListener refreshListener(RefreshEndpoint refreshEndpoint) {
-			return new RefreshListener(refreshEndpoint);
+		public RefreshListener refreshListener(ContextRefresher contextRefresher) {
+			return new RefreshListener(contextRefresher);
 		}
 
 		@Configuration
diff --git a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/RefreshListener.java b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/RefreshListener.java
index 3ef7ec3..8217902 100644
--- a/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/RefreshListener.java
+++ b/spring-cloud-bus/src/main/java/org/springframework/cloud/bus/event/RefreshListener.java
@@ -1,10 +1,10 @@
 package org.springframework.cloud.bus.event;
 
-import java.util.Arrays;
+import java.util.Set;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.springframework.cloud.endpoint.RefreshEndpoint;
+import org.springframework.cloud.context.refresh.ContextRefresher;
 import org.springframework.context.ApplicationListener;
 
 /**
@@ -15,16 +15,15 @@ public class RefreshListener
 
 	private static Log log = LogFactory.getLog(RefreshListener.class);
 
-	private RefreshEndpoint endpoint;
+	private ContextRefresher contextRefresher;
 
-	public RefreshListener(RefreshEndpoint endpoint) {
-		this.endpoint = endpoint;
+	public RefreshListener(ContextRefresher contextRefresher) {
+		this.contextRefresher = contextRefresher;
 	}
 
 	@Override
 	public void onApplicationEvent(RefreshRemoteApplicationEvent event) {
-		String[] keys = endpoint.refresh();
-		log.info(
-				"Received remote refresh request. Keys refreshed " + Arrays.asList(keys));
+		Set<String> keys = contextRefresher.refresh();
+		log.info("Received remote refresh request. Keys refreshed " + keys);
 	}
 }