Make InstanceRegisteredEvent implements ResolvableTypeProvider (#1468)

Fixes GH-1322

Signed-off-by: Yanming Zhou <[email protected]>
Signed-off-by: Spencer Gibb <[email protected]>
Co-authored-by: Spencer Gibb <[email protected]>

Author: quaff

spring-cloud-commons/src/main/java/org/springframework/cloud/client/discovery/event/InstanceRegisteredEvent.java

@@ -17,16 +17,19 @@
 package org.springframework.cloud.client.discovery.event;
 
 import org.springframework.context.ApplicationEvent;
+import org.springframework.core.ResolvableType;
+import org.springframework.core.ResolvableTypeProvider;
 
 /**
  * Event to be published after the local service instance registers itself with a
  * discovery service.
  *
  * @param <T> - type of configuration
  * @author Spencer Gibb
+ * @author Yanming Zhou
  */
 @SuppressWarnings("serial")
-public class InstanceRegisteredEvent<T> extends ApplicationEvent {
+public class InstanceRegisteredEvent<T> extends ApplicationEvent implements ResolvableTypeProvider {
 
 	private T config;
 
@@ -44,4 +47,8 @@ public T getConfig() {
 		return this.config;
 	}
 
+	@Override
+	public ResolvableType getResolvableType() {
+		return ResolvableType.forClassWithGenerics(getClass(), ResolvableType.forInstance(this.config));
+	}
 }

spring-cloud-commons/src/test/java/org/springframework/cloud/client/serviceregistry/AbstractAutoServiceRegistrationTests.java

@@ -39,6 +39,7 @@
 /**
  * @author Spencer Gibb
  * @author Tim Ysewyn
+ * @author Yanming Zhou
  */
 // @checkstyle:off
 @SpringBootTest(classes = AbstractAutoServiceRegistrationTests.Config.class, properties = "management.port=0",
@@ -49,6 +50,9 @@ public class AbstractAutoServiceRegistrationTests {
 	@Autowired
 	public PostEventListener postEventListener;
 
+	@Autowired
+	public TestRegistrationPostEventListener testRegistrationPostEventListener;
+
 	@Autowired
 	private TestAutoServiceRegistration autoRegistration;
 
@@ -81,6 +85,8 @@ public void eventsFireTest() {
 		then(this.preEventListener.registration.getServiceId()).isEqualTo("testRegistration2");
 		then(this.postEventListener.wasFired).isTrue();
 		then(this.postEventListener.config.getServiceId()).isEqualTo("testRegistration2");
+		then(this.testRegistrationPostEventListener.wasFired).isTrue();
+		then(this.testRegistrationPostEventListener.config.getServiceId()).isEqualTo("testRegistration2");
 	}
 
 	@EnableAutoConfiguration
@@ -102,6 +108,11 @@ public PostEventListener postEventListener() {
 			return new PostEventListener();
 		}
 
+		@Bean
+		public TestRegistrationPostEventListener testRegistrationPostEventListener() {
+			return new TestRegistrationPostEventListener();
+		}
+
 	}
 
 	public static class PreEventListener implements ApplicationListener<InstancePreRegisteredEvent> {
@@ -132,6 +143,20 @@ public void onApplicationEvent(InstanceRegisteredEvent event) {
 
 	}
 
+	public static class TestRegistrationPostEventListener implements ApplicationListener<InstanceRegisteredEvent<TestRegistration>> {
+
+		public boolean wasFired = false;
+
+		public TestRegistration config;
+
+		@Override
+		public void onApplicationEvent(InstanceRegisteredEvent<TestRegistration> event) {
+			this.config = event.getConfig();
+			this.wasFired = true;
+		}
+
+	}
+
 	public static class TestRegistration implements Registration {
 
 		@Override