Add XRpcServiceBean (#17)

* update XRpcServiceBean

* update

Author: JoeCqupt

x-rpc-spring-boot-starter/src/main/java/io/github/xinfra/lab/rpc/spring/bean/XRpcServiceAnnotationPostProcessor.java

@@ -16,6 +16,7 @@
  */
 package io.github.xinfra.lab.rpc.spring.bean;
 
+import io.github.xinfra.lab.rpc.config.ExporterConfig;
 import io.github.xinfra.lab.rpc.spring.annotation.XRpcService;
 import java.util.Collection;
 import java.util.Set;
@@ -25,7 +26,6 @@
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
@@ -106,14 +106,12 @@ private void scanXRpcServiceBeans(BeanDefinitionRegistry registry) {
             .flatMap(Collection::stream)
             .collect(Collectors.toSet());
     for (BeanDefinitionHolder beanDefinitionHolder : beanDefinitionHolders) {
-      registerExporterConfigBeans(registry, beanDefinitionHolder);
+      registerXRpcServiceBean(registry, beanDefinitionHolder);
     }
   }
 
-  private void registerExporterConfigBeans(
+  private void registerXRpcServiceBean(
       BeanDefinitionRegistry registry, BeanDefinitionHolder rpcServiceBeanDefinitionHolder) {
-    BeanDefinitionBuilder builder =
-        BeanDefinitionBuilder.rootBeanDefinition(ExporterConfigBean.class);
     // get service interface
     Class<?> beanClass =
         ClassUtils.resolveClassName(
@@ -123,12 +121,25 @@ private void registerExporterConfigBeans(
       log.warn("No interfaces found for class: {}", beanClass);
       throw new IllegalArgumentException("No interfaces found for class: " + beanClass);
     }
-    builder.addConstructorArgValue(allInterfaces[0]);
-    builder.addPropertyReference("providerBoostrap", "providerBoostrap");
-    builder.addPropertyReference("serviceImpl", rpcServiceBeanDefinitionHolder.getBeanName());
+    Class<?> serviceInterface = allInterfaces[0];
+
+    BeanDefinitionBuilder xRpcServiceBeanBuilder =
+        BeanDefinitionBuilder.rootBeanDefinition(XRpcServiceBean.class);
+    xRpcServiceBeanBuilder.addPropertyReference("providerBoostrap", "providerBoostrap");
+
     // todo resolve @XRpcService attrs
+    BeanDefinitionBuilder exporterConfigBuilder =
+        BeanDefinitionBuilder.rootBeanDefinition(ExporterConfig.class);
+    exporterConfigBuilder.addConstructorArgValue(serviceInterface);
+    exporterConfigBuilder.addPropertyReference(
+        "serviceImpl", rpcServiceBeanDefinitionHolder.getBeanName());
+    String exporterConfigBeanName =
+        BeanDefinitionReaderUtils.registerWithGeneratedName(
+            exporterConfigBuilder.getBeanDefinition(), registry);
+
+    xRpcServiceBeanBuilder.addPropertyReference("exporterConfig", exporterConfigBeanName);
 
-    AbstractBeanDefinition beanDefinition = builder.getBeanDefinition();
-    BeanDefinitionReaderUtils.registerWithGeneratedName(beanDefinition, registry);
+    BeanDefinitionReaderUtils.registerWithGeneratedName(
+        xRpcServiceBeanBuilder.getBeanDefinition(), registry);
   }
 }

…/rpc/spring/bean/ExporterConfigBean.java …lab/rpc/spring/bean/XRpcServiceBean.javax-rpc-spring-boot-starter/src/main/java/io/github/xinfra/lab/rpc/spring/bean/ExporterConfigBean.java renamed to x-rpc-spring-boot-starter/src/main/java/io/github/xinfra/lab/rpc/spring/bean/XRpcServiceBean.java x-rpc-spring-boot-starter/src/main/java/io/github/xinfra/lab/rpc/spring/bean/ExporterConfigBean.java renamed to x-rpc-spring-boot-starter/src/main/java/io/github/xinfra/lab/rpc/spring/bean/XRpcServiceBean.java

@@ -24,17 +24,15 @@
 import org.springframework.beans.factory.InitializingBean;
 
 @Slf4j
-public class ExporterConfigBean extends ExporterConfig implements InitializingBean {
+public class XRpcServiceBean implements InitializingBean {
 
   @Getter @Setter private ProviderBoostrap providerBoostrap;
 
-  public ExporterConfigBean(Class<?> serviceInterfaceClass) {
-    super(serviceInterfaceClass);
-  }
+  @Getter @Setter private ExporterConfig<?> exporterConfig;
 
   @Override
   public void afterPropertiesSet() throws Exception {
-    providerBoostrap.export(this);
-    log.info("XRpc export service: {}", getServiceInterfaceName());
+    providerBoostrap.export(exporterConfig);
+    log.info("XRpc export service: {}", exporterConfig.getServiceInterfaceName());
   }
 }