chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改yml配置读取绑定，遵循spring yml加载方式，支持environment级占位符替换

Browse Source
This commit is contained in:
mcy
2019-02-01 10:11:52 +08:00
parent a20960834b
commit 8211ef35e6
45 changed files with 4195 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/RdbAdapter.java
View File

@@ -5,10 +5,8 @@ import java.sql.SQLException;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import javax.sql.DataSource;
@@ -27,12 +25,7 @@ import com.alibaba.otter.canal.client.adapter.rdb.service.RdbEtlService;
import com.alibaba.otter.canal.client.adapter.rdb.service.RdbMirrorDbSyncService;
import com.alibaba.otter.canal.client.adapter.rdb.service.RdbSyncService;
import com.alibaba.otter.canal.client.adapter.rdb.support.SyncUtil;
import com.alibaba.otter.canal.client.adapter.support.DatasourceConfig;
import com.alibaba.otter.canal.client.adapter.support.Dml;
import com.alibaba.otter.canal.client.adapter.support.EtlResult;
import com.alibaba.otter.canal.client.adapter.support.OuterAdapterConfig;
import com.alibaba.otter.canal.client.adapter.support.SPI;
import com.alibaba.otter.canal.client.adapter.support.Util;
import com.alibaba.otter.canal.client.adapter.support.*;
/**
* RDB适配器实现类
@@ -74,8 +67,8 @@ public class RdbAdapter implements OuterAdapter {
* @param configuration 外部适配器配置信息
*/
@Override
public void init(OuterAdapterConfig configuration) {
Map<String, MappingConfig> rdbMappingTmp = ConfigLoader.load();
public void init(OuterAdapterConfig configuration, Properties envProperties) {
Map<String, MappingConfig> rdbMappingTmp = ConfigLoader.load(envProperties);
// 过滤不匹配的key的配置
rdbMappingTmp.forEach((key, mappingConfig) -> {
if ((mappingConfig.getOuterAdapterKey() == null && configuration.getKey() == null)

10
client-adapter/rdb/src/main/java/com/alibaba/otter/canal/client/adapter/rdb/config/ConfigLoader.java
View File

@@ -2,8 +2,10 @@ package com.alibaba.otter.canal.client.adapter.rdb.config;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Properties;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.otter.canal.client.adapter.config.YmlConfigBinder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.Yaml;
@@ -25,17 +27,15 @@ public class ConfigLoader {
*
* @return 配置名/配置文件名--对象
*/
@SuppressWarnings("unchecked")
public static Map<String, MappingConfig> load() {
public static Map<String, MappingConfig> load(Properties envProperties) {
logger.info("## Start loading rdb mapping config ... ");
Map<String, MappingConfig> result = new LinkedHashMap<>();
Map<String, String> configContentMap = MappingConfigsLoader.loadConfigs("rdb");
configContentMap.forEach((fileName, content) -> {
Map configMap = new Yaml().loadAs(content, Map.class); // yml自带的对象反射不是很稳定
JSONObject configJson = new JSONObject(configMap);
MappingConfig config = configJson.toJavaObject(MappingConfig.class);
MappingConfig config = YmlConfigBinder
.bindYmlToObj(null, content, MappingConfig.class, null, envProperties);
try {
config.validate();
} catch (Exception e) {

2
client-adapter/rdb/src/test/java/com/alibaba/otter/canal/client/adapter/rdb/test/ConfigLoadTest.java
View File

@@ -20,7 +20,7 @@ public class ConfigLoadTest {
@Test
public void testLoad() {
Map<String, MappingConfig> configMap = ConfigLoader.load();
Map<String, MappingConfig> configMap = ConfigLoader.load(null);
Assert.assertFalse(configMap.isEmpty());
}

2
client-adapter/rdb/src/test/java/com/alibaba/otter/canal/client/adapter/rdb/test/sync/Common.java
View File

@@ -24,7 +24,7 @@ public class Common {
outerAdapterConfig.setProperties(properties);
RdbAdapter adapter = new RdbAdapter();
adapter.init(outerAdapterConfig);
adapter.init(outerAdapterConfig, null);
return adapter;
}
}