Merge remote-tracking branch 'origin/v_2.0' into v_2.0

dbsyncer-biz/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>dbsyncer-biz</artifactId>

dbsyncer-cluster/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-cluster</artifactId>

dbsyncer-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-common</artifactId>

dbsyncer-connector/dbsyncer-connector-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-base/src/main/java/org/dbsyncer/connector/base/ConnectorFactory.java

@@ -16,14 +16,11 @@ import org.dbsyncer.sdk.model.ConnectorConfig;
 import org.dbsyncer.sdk.model.MetaInfo;
 import org.dbsyncer.sdk.model.Table;
 import org.dbsyncer.sdk.spi.ConnectorService;
-import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.DisposableBean;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
 import org.springframework.stereotype.Component;
 import org.springframework.util.Assert;
 
+import javax.annotation.PostConstruct;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -40,7 +37,7 @@ import java.util.concurrent.ConcurrentHashMap;
  * @Date 2019-09-18 23:30
  */
 @Component
-public class ConnectorFactory implements BeanDefinitionRegistryPostProcessor, DisposableBean {
+public class ConnectorFactory implements DisposableBean {
 
     private final Map<String, ConnectorInstance> pool = new ConcurrentHashMap<>();
 
@@ -48,8 +45,8 @@ public class ConnectorFactory implements BeanDefinitionRegistryPostProcessor, Di
 
     private final Set<String> connectorTypes = new HashSet<>();
 
-    @Override
-    public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry beanDefinitionRegistry) throws BeansException {
+    @PostConstruct
+    private void init() {
         ServiceLoader<ConnectorService> services = ServiceLoader.load(ConnectorService.class, Thread.currentThread().getContextClassLoader());
         for (ConnectorService s : services) {
             service.putIfAbsent(s.getConnectorType(), s);
@@ -57,11 +54,6 @@ public class ConnectorFactory implements BeanDefinitionRegistryPostProcessor, Di
         }
     }
 
-    @Override
-    public void postProcessBeanFactory(ConfigurableListableBeanFactory configurableListableBeanFactory) throws BeansException {
-
-    }
-
     @Override
     public void destroy() {
         pool.values().forEach(this::disconnect);

dbsyncer-connector/dbsyncer-connector-elasticsearch/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-file/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-kafka/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-mysql/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-oracle/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-postgresql/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-sqlite/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-sqlserver/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-sqlserver/src/main/java/org/dbsyncer/connector/sqlserver/DQLSqlServerConnector.java

@@ -36,7 +36,7 @@ public final class DQLSqlServerConnector extends AbstractDQLConnector {
 
     @Override
     public ConfigValidator getConfigValidator() {
-        return null;
+        return configValidator;
     }
 
     @Override

dbsyncer-connector/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-connector</artifactId>

dbsyncer-manager/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-manager</artifactId>

dbsyncer-parser/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-parser</artifactId>

dbsyncer-parser/src/main/java/org/dbsyncer/parser/sql/SqlParser.java

@@ -10,5 +10,5 @@ package org.dbsyncer.parser.sql;
  */
 public interface SqlParser {
 
-    public String parse();
+    String parse();
 }

dbsyncer-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-plugin</artifactId>

dbsyncer-sdk/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-sdk</artifactId>

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/connector/database/ds/SimpleDataSource.java

@@ -24,7 +24,7 @@ public class SimpleDataSource implements DataSource, AutoCloseable {
     /**
      * 默认最大连接
      */
-    private final int MAX_IDLE = 300;
+    private final int MAX_IDLE = 128;
 
     /**
      * 从缓存队列获取连接次数

dbsyncer-storage/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-storage</artifactId>

dbsyncer-web/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.0_1226-Beta</version>
+        <version>2.0.0_0108-Beta</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-web</artifactId>

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>org.ghi</groupId>
     <artifactId>dbsyncer</artifactId>
-    <version>2.0.0_1226-Beta</version>
+    <version>2.0.0_0108-Beta</version>
     <packaging>pom</packaging>
     <name>dbsyncer</name>
     <url>https://gitee.com/ghi/dbsyncer</url>