Polish apache#6333 : [Refactor] Using mandatory implementation of Ser…

…vice Instance registration instead of the event
mercyblitz · Jun 16, 2020 · c546f3c · c546f3c
1 parent eba44fa
commit c546f3c
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/...nfig/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java b/...nfig/dubbo-config-api/src/main/java/org/apache/dubbo/config/bootstrap/DubboBootstrap.java
@@ -66,6 +66,7 @@
 import org.apache.dubbo.registry.client.ServiceDiscovery;
 import org.apache.dubbo.registry.client.ServiceDiscoveryRegistry;
 import org.apache.dubbo.registry.client.ServiceInstance;
+import org.apache.dubbo.registry.client.ServiceInstanceCustomizer;
 import org.apache.dubbo.registry.support.AbstractRegistryFactory;
 import org.apache.dubbo.rpc.model.ApplicationModel;
 
@@ -1085,9 +1086,37 @@ private void registerServiceInstance() {
 
         ServiceInstance serviceInstance = createServiceInstance(serviceName, host, port);
 
+        preRegisterServiceInstance(serviceInstance);
+
         getServiceDiscoveries().forEach(serviceDiscovery -> serviceDiscovery.register(serviceInstance));
     }
 
+    /**
+     * Pre-register {@link ServiceInstance the service instance}
+     *
+     * @param serviceInstance {@link ServiceInstance the service instance}
+     * @since 2.7.8
+     */
+    private void preRegisterServiceInstance(ServiceInstance serviceInstance) {
+        customizeServiceInstance(serviceInstance);
+    }
+
+    /**
+     * Customize {@link ServiceInstance the service instance}
+     *
+     * @param serviceInstance {@link ServiceInstance the service instance}
+     * @since 2.7.8
+     */
+    private void customizeServiceInstance(ServiceInstance serviceInstance) {
+        ExtensionLoader<ServiceInstanceCustomizer> loader =
+                ExtensionLoader.getExtensionLoader(ServiceInstanceCustomizer.class);
+        // FIXME, sort customizer before apply
+        loader.getSupportedExtensionInstances().forEach(customizer -> {
+            // customizes
+            customizer.customize(serviceInstance);
+        });
+    }
+
     private URL selectMetadataServiceExportedURL() {
 
         URL selectedURL = null;

diff --git a/.../org/apache/dubbo/registry/client/event/listener/CustomizableServiceInstanceListener.java b/.../org/apache/dubbo/registry/client/event/listener/CustomizableServiceInstanceListener.java
@@ -26,7 +26,9 @@
  * Customize the {@link ServiceInstance} before registering to Registry.
  *
  * @since 2.7.5
+ * @deprecated 2.7.8 Current class will be removed since 3.0.0
  */
+@Deprecated
 public class CustomizableServiceInstanceListener implements EventListener<ServiceInstancePreRegisteredEvent> {
 
     @Override

diff --git a/...istry-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.event.EventListener b/...istry-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.event.EventListener
@@ -1,4 +1,7 @@
-service-instance=org.apache.dubbo.registry.client.event.listener.CustomizableServiceInstanceListener
+# "service-instance" has been deprecated since 2.7.8
+# service-instance=org.apache.dubbo.registry.client.event.listener.CustomizableServiceInstanceListener
+
 registry-logging=org.apache.dubbo.registry.client.event.listener.LoggingEventListener
+
 # "publishing-remote-metadata" in introduced since 2.7.8
 publishing-remote-metadata=org.apache.dubbo.registry.client.event.listener.PublishingRemoteMetadataListener