refactor for pr

CHANGELOG.md

@@ -3,3 +3,4 @@
 
 - [Bugfix: optimize ratelimit actuator](https://github.com/Tencent/spring-cloud-tencent/pull/413)
 - [Feature: add rate limit filter debug log](https://github.com/Tencent/spring-cloud-tencent/pull/417)
+- [Feature: graceful service registration after ApplicationReadyEventg](https://github.com/Tencent/spring-cloud-tencent/pull/441)

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisAutoServiceRegistration.java

@@ -29,7 +29,7 @@ import org.springframework.util.StringUtils;
 /**
  * Auto service registration of Polaris.
  *
- * @author Haotian Zhang, Andrew Shan, Jie Cheng
+ * @author Haotian Zhang, Andrew Shan, Jie Cheng, cheese8
  */
 public class PolarisAutoServiceRegistration extends AbstractGracefulServiceRegistration<Registration> {
 

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistry.java

@@ -47,7 +47,7 @@ import static org.springframework.util.ReflectionUtils.rethrowRuntimeException;
 /**
  * Service registry of Polaris.
  *
- * @author Haotian Zhang, Andrew Shan, Jie Cheng
+ * @author Haotian Zhang, Andrew Shan, Jie Cheng, cheese8
  */
 public class PolarisServiceRegistry implements ServiceRegistry<Registration> {
 
@@ -84,7 +84,6 @@ public class PolarisServiceRegistry implements ServiceRegistry<Registration> {
 			return;
 		}
 		// Register instance.
-		System.out.println("事件注册");
 		InstanceRegisterRequest instanceRegisterRequest = new InstanceRegisterRequest();
 		instanceRegisterRequest.setNamespace(polarisDiscoveryProperties.getNamespace());
 		instanceRegisterRequest.setService(registration.getServiceId());

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistryAutoConfiguration.java

@@ -39,12 +39,12 @@ import org.springframework.context.annotation.Configuration;
 /**
  * Autoconfiguration of service registry of Polaris.
  *
- * @author Haotian Zhang, Andrew Shan, Jie Cheng
+ * @author Haotian Zhang, Andrew Shan, Jie Cheng, cheese8
  */
 @Configuration(proxyBeanMethods = false)
 @EnableConfigurationProperties
 @ConditionalOnPolarisRegisterEnabled
-@ConditionalOnProperty(value = "spring.cloud.service-registry.graceful-registration.enabled", matchIfMissing = false)
+@ConditionalOnProperty(value = "spring.cloud.service-registry.graceful-registration.enabled", matchIfMissing = true)
 @AutoConfigureAfter({GracefulServiceRegistrationConfiguration.class,
 		GracefulServiceRegistrationAutoConfiguration.class,
 		PolarisDiscoveryAutoConfiguration.class})
@@ -70,8 +70,8 @@ public class PolarisServiceRegistryAutoConfiguration {
 	@ConditionalOnBean(GracefulServiceRegistrationProperties.class)
 	public PolarisAutoServiceRegistration polarisAutoServiceRegistration(
 			PolarisServiceRegistry registry,
-			GracefulServiceRegistrationProperties autoServiceRegistrationProperties,
+			GracefulServiceRegistrationProperties gracefulServiceRegistrationProperties,
 			PolarisRegistration registration) {
-		return new PolarisAutoServiceRegistration(registry, autoServiceRegistrationProperties, registration);
+		return new PolarisAutoServiceRegistration(registry, gracefulServiceRegistrationProperties, registration);
 	}
 }

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/graceful/AbstractGracefulServiceRegistration.java

@@ -28,7 +28,7 @@ import org.springframework.core.env.Environment;
  * TODO: Document the lifecycle.
  *
  * @param <R> Registration type passed to the {@link ServiceRegistry}.
- * @author Spencer Gibb
+ * @author Spencer Gibb, cheese8
  */
 public abstract class AbstractGracefulServiceRegistration<R extends Registration>
 		implements GracefulServiceRegistration, ApplicationContextAware,

spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/registry/graceful/GracefulServiceRegistrationAutoConfiguration.java

@@ -8,7 +8,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
 /**
- * @author Spencer Gibb
+ * @author Spencer Gibb, cheese8
  */
 @Configuration(proxyBeanMethods = false)
 @Import(GracefulServiceRegistrationConfiguration.class)

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/registry/PolarisGracefulServiceRegistrationTest.java

@@ -42,7 +42,7 @@ import static org.mockito.Mockito.doReturn;
 /**
  * Test for {@link PolarisAutoServiceRegistration}.
  *
- * @author Haotian Zhang
+ * @author Haotian Zhang, cheese8
  */
 @RunWith(MockitoJUnitRunner.class)
 public class PolarisGracefulServiceRegistrationTest {

spring-cloud-starter-tencent-polaris-discovery/src/test/java/com/tencent/cloud/polaris/registry/PolarisServiceRegistryTest.java

@@ -43,7 +43,7 @@ import static org.mockito.Mockito.when;
 /**
  * Test for {@link PolarisServiceRegistry}.
  *
- * @author Haotian Zhang
+ * @author Haotian Zhang, cheese8
  */
 public class PolarisServiceRegistryTest {
 

spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/src/main/java/com/tencent/cloud/polaris/discovery/service/caller/DiscoveryCallerService.java

@@ -27,7 +27,7 @@ import org.springframework.web.client.RestTemplate;
 /**
  * Discovery caller application.
  *
- * @author Haotian Zhang
+ * @author Haotian Zhang, cheese8
  */
 @SpringBootApplication
 @EnableFeignClients

spring-cloud-tencent-examples/polaris-discovery-example/discovery-caller-service/src/main/java/com/tencent/cloud/polaris/discovery/service/caller/SpringEventOrderListener.java

@@ -12,38 +12,42 @@ public class SpringEventOrderListener implements ApplicationListener {
 	public void onApplicationEvent(ApplicationEvent event) {
 		switch (event.getClass().getSimpleName()) {
 			case "ApplicationStartingEvent":
-				System.out.println("事件ApplicationStartingEvent");
+				System.out.println("Event ApplicationStartingEvent occurred");
 				break;
 			case "ApplicationEnvironmentPreparedEvent":
-				System.out.println("事件ApplicationEnvironmentPreparedEvent");
+				System.out.println("Event ApplicationEnvironmentPreparedEvent occurred");
 				break;
 			case "ApplicationContextInitializedEvent":
-				System.out.println("事件ApplicationContextInitializedEvent");
+				System.out.println("Event ApplicationContextInitializedEvent occurred");
 				break;
 			case "ApplicationPreparedEvent":
-				System.out.println("事件ApplicationPreparedEvent");
+				System.out.println("Event ApplicationPreparedEvent occurred");
 				break;
 			case "ContextRefreshedEvent":
-				System.out.println("事件ContextRefreshedEvent");
+				System.out.println("Event ContextRefreshedEvent occurred");
 				break;
 			case "ApplicationStartedEvent":
-				System.out.println("事件ApplicationStartedEvent");
+				System.out.println("Event ApplicationStartedEvent occurred");
+				break;
+			case "AvailabilityChangeEvent":
+				System.out.println("Event AvailabilityChangeEvent occurred");
 				break;
 			case "ServletWebServerInitializedEvent":
 				if (event instanceof WebServerInitializedEvent) {
-					System.out.println("事件WebServerInitializedEvent");
+					System.out.println("Event WebServerInitializedEvent occurred");
 				}
 				if (event instanceof ServletWebServerInitializedEvent) {
-					System.out.println("事件ServletWebServerInitializedEvent");
+					System.out.println("Event ServletWebServerInitializedEvent occurred");
 				}
 				if (event instanceof ReactiveWebServerInitializedEvent) {
-					System.out.println("事件ReactiveWebServerInitializedEvent");
+					System.out.println("Event ReactiveWebServerInitializedEvent occurred");
 				}
 				break;
 			case "ApplicationReadyEvent":
-				System.out.println("事件ApplicationReadyEvent");
+				System.out.println("Event ApplicationReadyEvent occurred");
 				break;
 			case "ApplicationFailedEvent":
+				System.out.println("Event ApplicationFailedEvent occurred");
 				break;
 		}
 	}