support x-rpc-spring-boot-starter (#16)

* support x-rpc-spring-boot-starter

* update

* update

* update

* update

* update

* update

* udpate

* update

* update

* update

* update

* add unit test

* unit test passed

* update

Author: JoeCqupt

pom.xml

@@ -14,15 +14,16 @@
         <module>x-rpc-registry</module>
         <module>x-rpc-api</module>
         <module>x-rpc-test</module>
+        <module>x-rpc-spring-boot-starter</module>
     </modules>
 
     <properties>
         <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <slf4j.version>2.0.7</slf4j.version>
+        <slf4j.version>1.7.36</slf4j.version>
         <lombok.version>1.18.28</lombok.version>
 
-        <logback.version>1.3.11</logback.version>
+        <logback.version>1.2.13</logback.version>
         <mockito.version>4.11.0</mockito.version>
         <junit5.version>5.9.1</junit5.version>
     </properties>
@@ -107,6 +108,13 @@
                 <scope>test</scope>
                 <version>${logback.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.apache.curator</groupId>
+                <artifactId>curator-test</artifactId>
+                <version>5.7.1</version>
+                <scope>test</scope>
+            </dependency>
             <!-- test scope end -->
 
         </dependencies>

x-rpc-api/src/main/java/io/github/xinfra/lab/rpc/cluster/router/RouterChain.java

@@ -16,4 +16,23 @@
  */
 package io.github.xinfra.lab.rpc.cluster.router;
 
-public interface RouterChain extends Router {}
+import io.github.xinfra.lab.rpc.invoker.Invocation;
+import io.github.xinfra.lab.rpc.registry.ServiceInstance;
+import java.util.ArrayList;
+import java.util.List;
+
+public class RouterChain {
+  private List<Router> routers = new ArrayList<>();
+
+  public void addRouter(Router router) {
+    routers.add(router);
+  }
+
+  public List<ServiceInstance> route(
+      Invocation invocation, List<ServiceInstance> serviceInstanceList) {
+    for (Router router : routers) {
+      serviceInstanceList = router.route(invocation, serviceInstanceList);
+    }
+    return serviceInstanceList;
+  }
+}

x-rpc-api/src/main/java/io/github/xinfra/lab/rpc/config/ConsumerConfig.java

@@ -35,5 +35,5 @@ public class ConsumerConfig {
 
   private List<Filter> filters;
 
-  private RouterChain routerChain;
+  private RouterChain routerChain = new RouterChain();
 }

x-rpc-api/src/main/java/io/github/xinfra/lab/rpc/config/ExporterConfig.java

@@ -25,7 +25,7 @@ public ExporterConfig(Class<T> serviceInterfaceClass) {
     super(serviceInterfaceClass);
   }
 
-  private ProviderConfig providerConfig;
+  protected ProviderConfig providerConfig;
 
   private T serviceImpl;
 

x-rpc-api/src/main/java/io/github/xinfra/lab/rpc/config/ProviderConfig.java

@@ -30,4 +30,6 @@ public class ProviderConfig {
   private ProtocolConfig protocolConfig;
 
   private List<Filter> filters;
+
+  private boolean autoRegister = true;
 }

x-rpc-api/src/main/java/io/github/xinfra/lab/rpc/config/ReferenceConfig.java

@@ -30,7 +30,7 @@ public ReferenceConfig(Class<T> serviceInterfaceClass) {
     super(serviceInterfaceClass);
   }
 
-  private ConsumerConfig consumerConfig;
+  protected ConsumerConfig consumerConfig;
 
   private ProxyType proxyType = ProxyType.JDK;
 

x-rpc-api/src/main/java/io/github/xinfra/lab/rpc/registry/Registry.java

@@ -27,7 +27,7 @@ public interface Registry extends Closeable {
 
   ServiceInstance getServiceInstance();
 
-  void register(ServiceConfig<?> serviceConfig);
+  void register(List<? extends ServiceConfig<?>> serviceConfigs);
 
   void update(ServiceInstance serviceInstance);
 

x-rpc-core/pom.xml

@@ -21,12 +21,12 @@
         <dependency>
             <groupId>io.github.xinfra.lab</groupId>
             <artifactId>x-rpc-transport-remoting</artifactId>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
         <dependency>
             <groupId>io.github.xinfra.lab</groupId>
             <artifactId>x-rpc-registry-zookeeper</artifactId>
-            <scope>provided</scope>
+            <optional>true</optional>
         </dependency>
 
         <!-- lombok -->

x-rpc-core/src/main/java/io/github/xinfra/lab/rpc/bootstrap/ConsumerBootstrap.java

@@ -90,6 +90,10 @@ public <T> T refer(ReferenceConfig<T> referenceConfig) {
     }
   }
 
+  public void unRefer(ReferenceConfig<?> referenceConfig) {
+    // todo
+  }
+
   @Override
   public void close() throws IOException {
     registryManager.close();

x-rpc-core/src/main/java/io/github/xinfra/lab/rpc/bootstrap/ProviderBoostrap.java

@@ -16,6 +16,7 @@
  */
 package io.github.xinfra.lab.rpc.bootstrap;
 
+import com.google.common.collect.Lists;
 import io.github.xinfra.lab.rpc.config.ExporterConfig;
 import io.github.xinfra.lab.rpc.config.ProviderConfig;
 import io.github.xinfra.lab.rpc.config.RegistryConfig;
@@ -31,10 +32,15 @@
 import io.github.xinfra.lab.rpc.transport.ServerTransportManager;
 import java.io.Closeable;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.commons.lang3.Validate;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class ProviderBoostrap implements Closeable {
+  private static final Logger log = LoggerFactory.getLogger(ProviderBoostrap.class);
   private ProviderConfig providerConfig;
 
   private ServerTransportManager serverTransportManager = new ServerTransportManager();
@@ -43,6 +49,8 @@ public class ProviderBoostrap implements Closeable {
 
   private AtomicBoolean metadataServiceExported = new AtomicBoolean(false);
 
+  private List<ExporterConfig<?>> exportedExporterConfigs = new ArrayList<>();
+
   public ProviderBoostrap(ProviderConfig providerConfig) {
     Validate.notNull(providerConfig);
     Validate.notNull(providerConfig.getApplicationConfig());
@@ -84,13 +92,27 @@ public void export(ExporterConfig<?> exporterConfig) {
       exportMetadataService(serverTransport, registry.getServiceInstance());
     }
 
-    // register
-    registry.register(exporterConfig);
+    // todo: check repeat export
+    exportedExporterConfigs.add(exporterConfig);
+    if (providerConfig.isAutoRegister()) {
+      registry.register(Lists.newArrayList(exporterConfig));
+    }
+  }
+
+  public void register() {
+    if (exportedExporterConfigs.isEmpty()) {
+      log.info("XRpc no service exported, skip registry register.");
+      return;
+    }
+    RegistryConfig<?> registryConfig = providerConfig.getRegistryConfig();
+    Registry registry = registryManager.getRegistry(registryConfig);
+    registry.register(exportedExporterConfigs);
+    log.info("XRpc {} service registered.", exportedExporterConfigs.size());
   }
 
   private void exportMetadataService(
       ServerTransport serverTransport, ServiceInstance serviceInstance) {
-    ExporterConfig exporterConfig = new ExporterConfig(MetadataService.class);
+    ExporterConfig<MetadataService> exporterConfig = new ExporterConfig<>(MetadataService.class);
     exporterConfig.setServiceImpl(new MetadataServiceImpl(serviceInstance));
     Invoker providerInvoker = new ProviderInvoker(exporterConfig);
     serverTransport.register(exporterConfig, providerInvoker);