AE86 5 vuotta sitten
vanhempi
säilyke
3704baabff

+ 7 - 5
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/MappingChecker.java

@@ -3,9 +3,10 @@
  */
 package org.dbsyncer.biz.checker.impl;
 
+import org.apache.commons.lang.StringUtils;
 import org.dbsyncer.biz.checker.AbstractChecker;
 import org.dbsyncer.parser.model.Mapping;
-import org.springframework.util.Assert;
+import org.dbsyncer.storage.constant.ConfigConstant;
 
 import java.util.Map;
 
@@ -18,10 +19,11 @@ public class MappingChecker extends AbstractChecker {
 
     @Override
     public void modify(Mapping mapping, Map<String, String> params) {
-        String name = params.get("name");
-        Assert.hasText(name, "MappingChecker modify name is empty.");
-
-        mapping.setName(name);
+        // 驱动名称
+        String name = params.get(ConfigConstant.CONFIG_MODEL_NAME);
+        if(StringUtils.isNotBlank(name)){
+            mapping.setName(name);
+        }
         mapping.setUpdateTime(System.currentTimeMillis());
     }
 

+ 2 - 1
dbsyncer-biz/src/main/java/org/dbsyncer/biz/checker/impl/MysqlChecker.java

@@ -3,6 +3,7 @@ package org.dbsyncer.biz.checker.impl;
 import org.dbsyncer.biz.checker.AbstractChecker;
 import org.dbsyncer.connector.config.DatabaseConfig;
 import org.dbsyncer.parser.model.Connector;
+import org.dbsyncer.storage.constant.ConfigConstant;
 import org.springframework.util.Assert;
 
 import java.util.Map;
@@ -16,7 +17,7 @@ public class MysqlChecker extends AbstractChecker {
 
     @Override
     public void modify(Connector connector, Map<String, String> params) {
-        String name = params.get("name");
+        String name = params.get(ConfigConstant.CONFIG_MODEL_NAME);
         String username = params.get("username");
         String password = params.get("password");
         String url = params.get("url");

+ 2 - 2
dbsyncer-biz/src/main/java/org/dbsyncer/biz/impl/CheckServiceImpl.java

@@ -47,7 +47,7 @@ public class CheckServiceImpl implements CheckService {
     public String checkConnector(Map<String, String> params) {
         logger.info("check connector params:{}", params);
         Assert.notEmpty(params, "CheckServiceImpl check connector params is null.");
-        String id = params.get("id");
+        String id = params.get(ConfigConstant.CONFIG_MODEL_ID);
         Connector connector = manager.getConnector(id);
         Assert.notNull(connector, "Can not find connector.");
         ConnectorConfig config = connector.getConfig();
@@ -65,7 +65,7 @@ public class CheckServiceImpl implements CheckService {
     public String checkMapping(Map<String, String> params) {
         logger.info("check mapping params:{}", params);
         Assert.notEmpty(params, "CheckServiceImpl check mapping params is null.");
-        String id = params.get("id");
+        String id = params.get(ConfigConstant.CONFIG_MODEL_ID);
         Mapping mapping = manager.getMapping(id);
         Assert.notNull(mapping, "Can not find mapping.");
         String type = mapping.getType();

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

@@ -9,6 +9,7 @@ import org.dbsyncer.listener.config.PollingListenerConfig;
 import org.dbsyncer.manager.Manager;
 import org.dbsyncer.parser.model.Connector;
 import org.dbsyncer.parser.model.Mapping;
+import org.dbsyncer.storage.constant.ConfigConstant;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
@@ -38,7 +39,7 @@ public class MappingServiceImpl implements MappingService {
 
     @Override
     public String add(Map<String, String> params) {
-        String name = params.get("name");
+        String name = params.get(ConfigConstant.CONFIG_MODEL_NAME);
         String sourceConnectorId = params.get("sourceConnectorId");
         String targetConnectorId = params.get("targetConnectorId");
         Assert.hasText(name, "mapping name is empty.");