Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
17289461
Shardingsphere
项目概览
apache
/
Shardingsphere
通知
56
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Shardingsphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
17289461
编写于
3月 24, 2018
作者:
T
terrymanu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
For #647: refactor MasterSlaveDataSourceFactory
上级
4889d6a3
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
11 addition
and
11 deletion
+11
-11
sharding-jdbc-core/src/main/java/io/shardingjdbc/core/api/MasterSlaveDataSourceFactory.java
...o/shardingjdbc/core/api/MasterSlaveDataSourceFactory.java
+11
-11
未找到文件。
sharding-jdbc-core/src/main/java/io/shardingjdbc/core/api/MasterSlaveDataSourceFactory.java
浏览文件 @
17289461
...
...
@@ -65,7 +65,7 @@ public final class MasterSlaveDataSourceFactory {
*/
public
static
DataSource
createDataSource
(
final
File
yamlFile
)
throws
SQLException
,
IOException
{
YamlMasterSlaveConfiguration
config
=
YamlMasterSlaveConfiguration
.
unmarshal
(
yamlFile
);
return
new
MasterSlaveDataSource
(
config
.
getDataSources
(),
config
.
getMasterSlaveRule
().
getMasterSlaveRuleConfiguration
().
build
(),
config
.
getMasterSlaveRule
().
getConfigMap
());
return
createDataSource
(
config
.
getDataSources
(),
config
.
getMasterSlaveRule
().
getMasterSlaveRuleConfiguration
(),
config
.
getMasterSlaveRule
().
getConfigMap
());
}
/**
...
...
@@ -73,15 +73,14 @@ public final class MasterSlaveDataSourceFactory {
*
* <p>One master data source can configure multiple slave data source.</p>
*
* @param dataSourceMap data source map
* @param yamlFile yaml file for master-slave rule configuration without data sources
* @param yamlBytes yaml bytes for master-slave rule configuration with data sources
* @return master-slave data source
* @throws SQLException SQL exception
* @throws IOException IO exception
*/
public
static
DataSource
createDataSource
(
final
Map
<
String
,
DataSource
>
dataSourceMap
,
final
File
yamlFile
)
throws
SQLException
,
IOException
{
YamlMasterSlaveConfiguration
config
=
YamlMasterSlaveConfiguration
.
unmarshal
(
yaml
File
);
return
new
MasterSlaveDataSource
(
dataSourceMap
,
config
.
getMasterSlaveRule
().
getMasterSlaveRuleConfiguration
().
build
(),
config
.
getMasterSlaveRule
().
getConfigMap
());
public
static
DataSource
createDataSource
(
final
byte
[]
yamlBytes
)
throws
SQLException
,
IOException
{
YamlMasterSlaveConfiguration
config
=
YamlMasterSlaveConfiguration
.
unmarshal
(
yaml
Bytes
);
return
createDataSource
(
config
.
getDataSources
(),
config
.
getMasterSlaveRule
().
getMasterSlaveRuleConfiguration
(),
config
.
getMasterSlaveRule
().
getConfigMap
());
}
/**
...
...
@@ -89,14 +88,15 @@ public final class MasterSlaveDataSourceFactory {
*
* <p>One master data source can configure multiple slave data source.</p>
*
* @param yamlBytes yaml bytes for master-slave rule configuration with data sources
* @param dataSourceMap data source map
* @param yamlFile yaml file for master-slave rule configuration without data sources
* @return master-slave data source
* @throws SQLException SQL exception
* @throws IOException IO exception
*/
public
static
DataSource
createDataSource
(
final
byte
[]
yamlBytes
)
throws
SQLException
,
IOException
{
YamlMasterSlaveConfiguration
config
=
YamlMasterSlaveConfiguration
.
unmarshal
(
yaml
Bytes
);
return
new
MasterSlaveDataSource
(
config
.
getDataSources
(),
config
.
getMasterSlaveRule
().
getMasterSlaveRuleConfiguration
().
build
(),
config
.
getMasterSlaveRule
().
getConfigMap
());
public
static
DataSource
createDataSource
(
final
Map
<
String
,
DataSource
>
dataSourceMap
,
final
File
yamlFile
)
throws
SQLException
,
IOException
{
YamlMasterSlaveConfiguration
config
=
YamlMasterSlaveConfiguration
.
unmarshal
(
yaml
File
);
return
createDataSource
(
dataSourceMap
,
config
.
getMasterSlaveRule
().
getMasterSlaveRuleConfiguration
(),
config
.
getMasterSlaveRule
().
getConfigMap
());
}
/**
...
...
@@ -112,6 +112,6 @@ public final class MasterSlaveDataSourceFactory {
*/
public
static
DataSource
createDataSource
(
final
Map
<
String
,
DataSource
>
dataSourceMap
,
final
byte
[]
yamlBytes
)
throws
SQLException
,
IOException
{
YamlMasterSlaveConfiguration
config
=
YamlMasterSlaveConfiguration
.
unmarshal
(
yamlBytes
);
return
new
MasterSlaveDataSource
(
dataSourceMap
,
config
.
getMasterSlaveRule
().
getMasterSlaveRuleConfiguration
().
build
(),
config
.
getMasterSlaveRule
().
getConfigMap
());
return
createDataSource
(
dataSourceMap
,
config
.
getMasterSlaveRule
().
getMasterSlaveRuleConfiguration
(),
config
.
getMasterSlaveRule
().
getConfigMap
());
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录