Merge pull request #1870 from ryanjbaxter/force-eurekaclient-creation-on-refresh

Make sure the EurekaClient bean is recreated after refresh.

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java

@@ -61,11 +61,19 @@ public class EurekaDiscoveryClientConfiguration {
 	@ConditionalOnClass(RefreshScopeRefreshedEvent.class)
 	protected static class EurekaClientConfigurationRefresher {
 
+		@Autowired(required = false)
+		private EurekaClient eurekaClient;
+
 		@Autowired(required = false)
 		private EurekaAutoServiceRegistration autoRegistration;
 
 		@EventListener(RefreshScopeRefreshedEvent.class)
 		public void onApplicationEvent(RefreshScopeRefreshedEvent event) {
+			//This will force the creation of the EurkaClient bean if not already created
+			//to make sure the client will be reregistered after a refresh event
+			if(eurekaClient != null) {
+				eurekaClient.getApplications();
+			}
 			if (autoRegistration != null) {
 				// register in case meta data changed
 				this.autoRegistration.stop();

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/ConfigRefreshTests.java

@@ -0,0 +1,60 @@
+/*
+ *
+ *  * Copyright 2013-2016 the original author or authors.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  *      http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package org.springframework.cloud.netflix.eureka.config;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cloud.context.scope.refresh.RefreshScopeRefreshedEvent;
+import org.springframework.cloud.netflix.eureka.sample.RefreshEurekaSampleApplication;
+import org.springframework.context.ApplicationEventPublisher;
+import org.springframework.test.context.junit4.SpringRunner;
+
+import com.netflix.discovery.EurekaClient;
+
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+/**
+ * @author Ryan Baxter
+ */
+@RunWith(SpringRunner.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = RefreshEurekaSampleApplication.class)
+public class ConfigRefreshTests {
+
+	@Autowired
+	private ApplicationEventPublisher publisher;
+
+	@Autowired
+	//Mocked in RefreshEurekaSampleApplication
+	private EurekaClient client;
+
+	@Test
+	// This test is used to verify that getApplications is called the correct number of times
+	// when a refresh event is fired.  The getApplications call in EurekaClientConfigurationRefresher.onApplicationEvent
+	// ensures that the EurekaClient bean is recreated after a refresh event and that we reregister the client with
+	//the server
+	public void verifyGetApplications() {
+		if(publisher != null) {
+			publisher.publishEvent(new RefreshScopeRefreshedEvent());
+		}
+		verify(client, times(3)).getApplications();
+	}
+}

spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/sample/RefreshEurekaSampleApplication.java

@@ -0,0 +1,47 @@
+/*
+ *
+ *  * Copyright 2013-2016 the original author or authors.
+ *  *
+ *  * Licensed under the Apache License, Version 2.0 (the "License");
+ *  * you may not use this file except in compliance with the License.
+ *  * You may obtain a copy of the License at
+ *  *
+ *  *      http://www.apache.org/licenses/LICENSE-2.0
+ *  *
+ *  * Unless required by applicable law or agreed to in writing, software
+ *  * distributed under the License is distributed on an "AS IS" BASIS,
+ *  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  * See the License for the specific language governing permissions and
+ *  * limitations under the License.
+ *
+ */
+
+package org.springframework.cloud.netflix.eureka.sample;
+
+import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.netflix.eureka.CloudEurekaClient;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.netflix.discovery.EurekaClient;
+
+import static org.mockito.Mockito.mock;
+
+/**
+ * @author Ryan Baxter
+ */
+@Configuration
+@ComponentScan
+@EnableAutoConfiguration
+@RestController
+@EnableDiscoveryClient
+public class RefreshEurekaSampleApplication {
+
+	@Bean
+	public EurekaClient getClient() {
+		return mock(CloudEurekaClient.class);
+	}
+}