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.4</version>
+        <version>2.0.5</version>
     </parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>dbsyncer-biz</artifactId>

dbsyncer-common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/dbsyncer-connector-mysql/src/main/java/org/dbsyncer/connector/mysql/cdc/MySQLListener.java

@@ -61,10 +61,8 @@ public class MySQLListener extends AbstractDatabaseListener {
 
     private final String BINLOG_FILENAME = "fileName";
     private final String BINLOG_POSITION = "position";
-    private final int MASTER = 0;
-    private Map<Long, TableMapEventData> tables = new HashMap<>();
+    private final Map<Long, TableMapEventData> tables = new HashMap<>();
     private BinaryLogClient client;
-    private List<Host> cluster;
     private String database;
     private final Lock connectLock = new ReentrantLock();
 
@@ -110,9 +108,10 @@ public class MySQLListener extends AbstractDatabaseListener {
             throw new MySQLException("url is invalid");
         }
         database = DatabaseUtil.getDatabaseName(config.getUrl());
-        cluster = readNodes(config.getUrl());
+        List<Host> cluster = readNodes(config.getUrl());
         Assert.notEmpty(cluster, "MySQL连接地址有误.");
 
+        int MASTER = 0;
         final Host host = cluster.get(MASTER);
         final String username = config.getUsername();
         final String password = config.getPassword();
@@ -141,9 +140,8 @@ public class MySQLListener extends AbstractDatabaseListener {
 
         List<Host> cluster = new ArrayList<>();
         String[] arr = StringUtil.split(url, ",");
-        int size = arr.length;
-        for (int i = 0; i < size; i++) {
-            String[] host = StringUtil.split(arr[i], ":");
+        for (String s : arr) {
+            String[] host = StringUtil.split(s, ":");
             if (2 == host.length) {
                 cluster.add(new Host(host[0], Integer.parseInt(host[1])));
             }
@@ -190,9 +188,9 @@ public class MySQLListener extends AbstractDatabaseListener {
         }
     }
 
-    final class Host {
-        private String ip;
-        private int port;
+    static final class Host {
+        private final String ip;
+        private final int port;
 
         public Host(String ip, int port) {
             this.ip = ip;

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer-connector</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

dbsyncer-connector/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-parser</artifactId>

dbsyncer-parser/src/main/java/org/dbsyncer/parser/consumer/impl/LogConsumer.java

@@ -27,7 +27,7 @@ import java.util.function.Consumer;
  * @Date 2023-11-12 02:25
  */
 public final class LogConsumer extends AbstractConsumer<RowChangedEvent> {
-    private Map<String, List<FieldPicker>> tablePicker = new LinkedHashMap<>();
+    private final Map<String, List<FieldPicker>> tablePicker = new LinkedHashMap<>();
 
     //判断上次是否为ddl，是ddl需要强制刷新下picker
     private boolean ddlChanged;

dbsyncer-parser/src/main/java/org/dbsyncer/parser/consumer/impl/QuartzConsumer.java

@@ -20,7 +20,7 @@ import java.util.List;
  * @Date 2023-11-12 02:18
  */
 public final class QuartzConsumer extends AbstractConsumer<ScanChangedEvent> {
-    private List<FieldPicker> tablePicker = new LinkedList<>();
+    private final List<FieldPicker> tablePicker = new LinkedList<>();
 
     @Override
     public void postProcessBeforeInitialization() {

dbsyncer-parser/src/main/java/org/dbsyncer/parser/flush/impl/TableGroupBufferActuator.java

@@ -61,7 +61,7 @@ public class TableGroupBufferActuator extends GeneralBufferActuator implements C
         int coreSize = tableGroupBufferConfig.getThreadCoreSize();
         int maxSize = tableGroupBufferConfig.getMaxThreadSize();
         int queueCapacity = tableGroupBufferConfig.getThreadQueueCapacity();
-        String threadNamePrefix = new StringBuilder("TableGroupExecutor-").append(tableGroupId).append(StringUtil.SYMBOL).toString();
+        String threadNamePrefix = "TableGroupExecutor-" + tableGroupId + StringUtil.SYMBOL;
         threadPoolTaskExecutor = ThreadPoolUtil.newThreadPoolTaskExecutor(coreSize, maxSize, queueCapacity, 30, threadNamePrefix);
         running = true;
         scheduledTaskService.start(taskKey, tableGroupBufferConfig.getBufferPeriodMillisecond(), this);

dbsyncer-plugin/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>dbsyncer-sdk</artifactId>

dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/enums/ChangedEventTypeEnum.java

@@ -22,7 +22,7 @@ public enum ChangedEventTypeEnum {
     ROW;
 
     public static boolean isDDL(ChangedEventTypeEnum event) {
-        return event != null && DDL == event;
+        return DDL == event;
     }
 
 }

dbsyncer-storage/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dbsyncer</artifactId>
         <groupId>org.ghi</groupId>
-        <version>2.0.4</version>
+        <version>2.0.5</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.4</version>
+        <version>2.0.5</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.4</version>
+    <version>2.0.5</version>
     <packaging>pom</packaging>
     <name>dbsyncer</name>
     <url>https://gitee.com/ghi/dbsyncer</url>

version.cmd

@@ -1,7 +1,7 @@
 @echo off
 
 set CURRENT_DATE=%date:~5,2%%date:~8,2%
-set VERSION=2.0.4_%CURRENT_DATE%
+set VERSION=2.0.5_%CURRENT_DATE%
 set /p APP_VERSION=Please enter a new version number(%VERSION%): || set APP_VERSION=%VERSION%
 echo %APP_VERSION%
 

version.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-VERSION=2.0.4_$(date +"%m%d")
+VERSION=2.0.5_$(date +"%m%d")
 read -p "Please enter a new version number($VERSION)：" APP_VERSION
 if [ -z "$APP_VERSION" ]; then
   APP_VERSION=$VERSION