Browse Source

替换分隔符

穿云 2 tháng trước cách đây
mục cha
commit
322c9a012b
13 tập tin đã thay đổi với 15 bổ sung13 xóa
  1. 1 1
      dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/DataSyncServiceImpl.java
  2. 1 1
      dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MetricReporter.java
  3. 2 1
      dbsyncer-connector/dbsyncer-connector-elasticsearch/src/main/java/org/dbsyncer/connector/elasticsearch/api/RequestConverters.java
  4. 1 1
      dbsyncer-connector/dbsyncer-connector-elasticsearch/src/main/java/org/dbsyncer/connector/elasticsearch/util/ESUtil.java
  5. 1 1
      dbsyncer-connector/dbsyncer-connector-mysql/src/main/java/org/dbsyncer/connector/mysql/cdc/MySQLListener.java
  6. 1 1
      dbsyncer-connector/dbsyncer-connector-mysql/src/main/java/org/dbsyncer/connector/mysql/storage/MySQLStorageService.java
  7. 1 1
      dbsyncer-connector/dbsyncer-connector-sqlite/src/main/java/org/dbsyncer/connector/sqlite/DqlSQLiteConnector.java
  8. 1 1
      dbsyncer-connector/dbsyncer-connector-sqlserver/src/main/java/org/dbsyncer/connector/sqlserver/DQLSqlServerConnector.java
  9. 1 1
      dbsyncer-connector/dbsyncer-connector-sqlserver/src/main/java/org/dbsyncer/connector/sqlserver/SqlServerConnector.java
  10. 1 1
      dbsyncer-parser/src/main/java/org/dbsyncer/parser/convert/handler/ReplaceHandler.java
  11. 1 1
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/connector/database/sqlbuilder/SqlBuilderUpdate.java
  12. 2 1
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/sqlparser/SimpleSqlParser.java
  13. 1 1
      dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/util/PrimaryKeyUtil.java

+ 1 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/DataSyncServiceImpl.java

@@ -246,7 +246,7 @@ public class DataSyncServiceImpl implements DataSyncService {
         byte[] b = null;
         if (s.startsWith("[") && s.endsWith("]")) {
             s = StringUtil.substring(s, 1, s.length() - 1);
-            String[] split = StringUtil.split(s, ",");
+            String[] split = StringUtil.split(s, StringUtil.COMMA);
             int length = split.length;
             b = new byte[length];
             for (int i = 0; i < length; i++) {

+ 1 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/MetricReporter.java

@@ -151,7 +151,7 @@ public class MetricReporter implements ScheduledTaskJob {
             mappingReportMetric.setUpdate(getMappingUpdate(metaAll));
             mappingReportMetric.setDelete(getMappingDelete(metaAll));
         } catch (Exception e) {
-            logger.error(e.getMessage());
+            logger.error(e.getMessage(), e);
         } finally {
             running = false;
         }

+ 2 - 1
dbsyncer-connector/dbsyncer-connector-elasticsearch/src/main/java/org/dbsyncer/connector/elasticsearch/api/RequestConverters.java

@@ -12,6 +12,7 @@ import org.apache.http.client.methods.HttpPut;
 import org.apache.http.entity.ContentType;
 import org.apache.http.nio.entity.NByteArrayEntity;
 import org.apache.lucene.util.BytesRef;
+import org.dbsyncer.common.util.StringUtil;
 import org.elasticsearch.Version;
 import org.elasticsearch.action.DocWriteRequest;
 import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
@@ -1027,7 +1028,7 @@ final class RequestConverters {
                 if (indicesOptions.expandWildcardsOpen() == false && indicesOptions.expandWildcardsClosed() == false) {
                     expandWildcards = "none";
                 } else {
-                    StringJoiner joiner = new StringJoiner(",");
+                    StringJoiner joiner = new StringJoiner(StringUtil.COMMA);
                     if (indicesOptions.expandWildcardsOpen()) {
                         joiner.add("open");
                     }

+ 1 - 1
dbsyncer-connector/dbsyncer-connector-elasticsearch/src/main/java/org/dbsyncer/connector/elasticsearch/util/ESUtil.java

@@ -41,7 +41,7 @@ public abstract class ESUtil {
     }
 
     public static EasyRestHighLevelClient getConnection(ESConfig config) {
-        String[] ipAddress = StringUtil.split(config.getUrl(), ",");
+        String[] ipAddress = StringUtil.split(config.getUrl(), StringUtil.COMMA);
         HttpHost[] hosts = Arrays.stream(ipAddress).map(node -> HttpHost.create(node)).filter(Objects::nonNull).toArray(
                 HttpHost[]::new);
         RestClientBuilder builder = RestClient.builder(hosts);

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

@@ -139,7 +139,7 @@ public class MySQLListener extends AbstractDatabaseListener {
         url = StringUtil.replace(url, "/", "");
 
         List<Host> cluster = new ArrayList<>();
-        String[] arr = StringUtil.split(url, ",");
+        String[] arr = StringUtil.split(url, StringUtil.COMMA);
         for (String s : arr) {
             String[] host = StringUtil.split(s, ":");
             if (2 == host.length) {

+ 1 - 1
dbsyncer-connector/dbsyncer-connector-mysql/src/main/java/org/dbsyncer/connector/mysql/storage/MySQLStorageService.java

@@ -238,7 +238,7 @@ public class MySQLStorageService extends AbstractStorageService {
         // order by updateTime,createTime desc
         sql.append(" order by ");
         if (executor.isOrderByUpdateTime()) {
-            sql.append(UnderlineToCamelUtils.camelToUnderline(ConfigConstant.CONFIG_MODEL_UPDATE_TIME)).append(",");
+            sql.append(UnderlineToCamelUtils.camelToUnderline(ConfigConstant.CONFIG_MODEL_UPDATE_TIME)).append(StringUtil.COMMA);
         }
         sql.append(UnderlineToCamelUtils.camelToUnderline(ConfigConstant.CONFIG_MODEL_CREATE_TIME));
         sql.append(" ").append(query.getSort().getCode());

+ 1 - 1
dbsyncer-connector/dbsyncer-connector-sqlite/src/main/java/org/dbsyncer/connector/sqlite/DqlSQLiteConnector.java

@@ -49,7 +49,7 @@ public final class DqlSQLiteConnector extends AbstractDQLConnector {
     @Override
     public String getPageSql(PageSql config) {
         List<String> primaryKeys = config.getPrimaryKeys();
-        String orderBy = StringUtil.join(primaryKeys, ",");
+        String orderBy = StringUtil.join(primaryKeys, StringUtil.COMMA);
         return String.format(DatabaseConstant.SQLITE_PAGE_SQL, orderBy, config.getQuerySql());
     }
 

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

@@ -53,7 +53,7 @@ public final class DQLSqlServerConnector extends AbstractDQLConnector {
     @Override
     public String getPageSql(PageSql config) {
         List<String> primaryKeys = config.getPrimaryKeys();
-        String orderBy = StringUtil.join(primaryKeys, ",");
+        String orderBy = StringUtil.join(primaryKeys, StringUtil.COMMA);
         return String.format(DatabaseConstant.SQLSERVER_PAGE_SQL, orderBy, config.getQuerySql());
     }
 

+ 1 - 1
dbsyncer-connector/dbsyncer-connector-sqlserver/src/main/java/org/dbsyncer/connector/sqlserver/SqlServerConnector.java

@@ -81,7 +81,7 @@ public final class SqlServerConnector extends AbstractDatabaseConnector {
     @Override
     public String getPageSql(PageSql config) {
         List<String> primaryKeys = buildPrimaryKeys(config.getPrimaryKeys());
-        String orderBy = StringUtil.join(primaryKeys, ",");
+        String orderBy = StringUtil.join(primaryKeys, StringUtil.COMMA);
         return String.format(DatabaseConstant.SQLSERVER_PAGE_SQL, orderBy, config.getQuerySql());
     }
 

+ 1 - 1
dbsyncer-parser/src/main/java/org/dbsyncer/parser/convert/handler/ReplaceHandler.java

@@ -16,7 +16,7 @@ public class ReplaceHandler extends AbstractHandler {
     @Override
     protected Object convert(String args, Object value) {
         Assert.hasText(args, "缺少替换参数.");
-        String[] split = StringUtil.split(args, ",");
+        String[] split = StringUtil.split(args, StringUtil.COMMA);
         String a = split[0];
         String b = split.length == 2 ? split[1] : "";
         return StringUtil.replace(String.valueOf(value), a, b);

+ 1 - 1
dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/connector/database/sqlbuilder/SqlBuilderUpdate.java

@@ -42,7 +42,7 @@ public class SqlBuilderUpdate extends AbstractSqlBuilder {
             sql.append(database.buildFieldName(fields.get(i)));
             sql.append(quotation).append("=?");
             if (i < size - 1) {
-                sql.append(",");
+                sql.append(StringUtil.COMMA);
             }
         }
 

+ 2 - 1
dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/sqlparser/SimpleSqlParser.java

@@ -261,6 +261,7 @@ import net.sf.jsqlparser.statement.update.UpdateModifierPriority;
 import net.sf.jsqlparser.statement.update.UpdateSet;
 import net.sf.jsqlparser.statement.upsert.Upsert;
 import net.sf.jsqlparser.statement.upsert.UpsertType;
+import org.dbsyncer.common.util.StringUtil;
 
 import java.util.AbstractMap;
 import java.util.ArrayList;
@@ -21634,7 +21635,7 @@ BUT NOT for Schema or  Aliases (without quoting)
                     switch ((jj_ntk==-1)?jj_ntk_f():jj_ntk) {
                         case K_COMMA:{
                             jj_consume_token(K_COMMA);
-                            retval.append(",");
+                            retval.append(StringUtil.COMMA);
                             break;
                         }
                         case 396:{

+ 1 - 1
dbsyncer-sdk/src/main/java/org/dbsyncer/sdk/util/PrimaryKeyUtil.java

@@ -158,7 +158,7 @@ public abstract class PrimaryKeyUtil {
     public static Object[] getLastCursors(String str) {
         Object[] cursors = null;
         if (StringUtil.isNotBlank(str)) {
-            String[] split = StringUtil.split(str, ",");
+            String[] split = StringUtil.split(str, StringUtil.COMMA);
             int length = split.length;
             cursors = new Object[length];
             for (int i = 0; i < length; i++) {