Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
8d1f1f09
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 搜索 >>
提交
8d1f1f09
编写于
4月 04, 2018
作者:
M
maxiaoguang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
根据sj代码规范修改代码
上级
e0d3f702
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
48 addition
and
48 deletion
+48
-48
sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingjdbc/orchestration/spring/datasource/OrchestrationMasterSlaveDataSourceFacoryBean.java
...asource/OrchestrationMasterSlaveDataSourceFacoryBean.java
+12
-12
sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingjdbc/orchestration/spring/datasource/OrchestrationShardingDataSourceFacoryBean.java
...datasource/OrchestrationShardingDataSourceFacoryBean.java
+13
-13
sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingjdbc/orchestration/spring/namespace/parser/AbstractOrchestrationBeanDefinitionParser.java
...ace/parser/AbstractOrchestrationBeanDefinitionParser.java
+1
-1
sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingjdbc/orchestration/spring/namespace/parser/OrchestrationMasterSlaveDataSourceBeanDefinitionParser.java
...chestrationMasterSlaveDataSourceBeanDefinitionParser.java
+2
-2
sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingjdbc/orchestration/spring/namespace/parser/OrchestrationShardingDataSourceBeanDefinitionParser.java
.../OrchestrationShardingDataSourceBeanDefinitionParser.java
+3
-3
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/api/OrchestrationMasterSlaveDataSourceFactory.java
...ration/api/OrchestrationMasterSlaveDataSourceFactory.java
+9
-9
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/api/OrchestrationShardingDataSourceFactory.java
...estration/api/OrchestrationShardingDataSourceFactory.java
+3
-3
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/api/config/OrchestrationConfiguration.java
.../orchestration/api/config/OrchestrationConfiguration.java
+2
-2
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/internal/OrchestrationFacade.java
...rdingjdbc/orchestration/internal/OrchestrationFacade.java
+2
-2
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/yaml/YamlOrchestrationConfiguration.java
...bc/orchestration/yaml/YamlOrchestrationConfiguration.java
+1
-1
未找到文件。
sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingjdbc/orchestration/spring/datasource/OrchestrationMasterSlaveDataSourceFacoryBean.java
浏览文件 @
8d1f1f09
...
...
@@ -13,21 +13,21 @@ import java.sql.SQLException;
import
java.util.Map
;
public
class
OrchestrationMasterSlaveDataSourceFacoryBean
implements
FactoryBean
<
OrchestrationMasterSlaveDataSource
>,
InitializingBean
,
DisposableBean
{
private
OrchestrationMasterSlaveDataSource
orchestrationMasterSlaveDataSource
;
private
final
Map
<
String
,
DataSource
>
dataSourceMap
;
private
final
MasterSlaveRuleConfiguration
masterSlaveRuleConfig
;
private
final
Map
<
String
,
Object
>
configMap
;
private
final
OrchestrationConfiguration
orchestrationConfig
;
public
OrchestrationMasterSlaveDataSourceFacoryBean
(
final
OrchestrationConfiguration
orchestrationConfig
)
throws
SQLException
{
this
(
null
,
null
,
null
,
orchestrationConfig
);
}
public
OrchestrationMasterSlaveDataSourceFacoryBean
(
final
Map
<
String
,
DataSource
>
dataSourceMap
,
final
MasterSlaveRuleConfiguration
masterSlaveRuleConfig
,
final
Map
<
String
,
Object
>
configMap
,
final
OrchestrationConfiguration
orchestrationConfig
)
throws
SQLException
{
this
.
orchestrationConfig
=
orchestrationConfig
;
...
...
@@ -35,27 +35,27 @@ public class OrchestrationMasterSlaveDataSourceFacoryBean implements FactoryBean
this
.
masterSlaveRuleConfig
=
masterSlaveRuleConfig
;
this
.
configMap
=
configMap
;
}
@Override
public
OrchestrationMasterSlaveDataSource
getObject
()
throws
Exception
{
return
orchestrationMasterSlaveDataSource
;
}
@Override
public
Class
<?>
getObjectType
()
{
return
OrchestrationMasterSlaveDataSource
.
class
;
}
@Override
public
boolean
isSingleton
()
{
return
true
;
}
@Override
public
void
afterPropertiesSet
()
throws
Exception
{
orchestrationMasterSlaveDataSource
=
(
OrchestrationMasterSlaveDataSource
)
OrchestrationMasterSlaveDataSourceFactory
.
createDataSource
(
dataSourceMap
,
masterSlaveRuleConfig
,
configMap
,
orchestrationConfig
);
}
@Override
public
void
destroy
()
throws
Exception
{
orchestrationMasterSlaveDataSource
.
close
();
...
...
sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingjdbc/orchestration/spring/datasource/OrchestrationShardingDataSourceFacoryBean.java
浏览文件 @
8d1f1f09
...
...
@@ -14,23 +14,23 @@ import java.util.Map;
import
java.util.Properties
;
public
class
OrchestrationShardingDataSourceFacoryBean
implements
FactoryBean
<
OrchestrationShardingDataSource
>,
InitializingBean
,
DisposableBean
{
private
OrchestrationShardingDataSource
orchestrationShardingDataSource
;
private
final
Map
<
String
,
DataSource
>
dataSourceMap
;
private
final
ShardingRuleConfiguration
shardingRuleConfig
;
private
final
Map
<
String
,
Object
>
configMap
;
private
final
Properties
props
;
private
final
OrchestrationConfiguration
orchestrationConfig
;
public
OrchestrationShardingDataSourceFacoryBean
(
final
OrchestrationConfiguration
orchestrationConfig
)
throws
SQLException
{
this
(
null
,
null
,
null
,
null
,
orchestrationConfig
);
}
public
OrchestrationShardingDataSourceFacoryBean
(
final
Map
<
String
,
DataSource
>
dataSourceMap
,
final
ShardingRuleConfiguration
shardingRuleConfig
,
final
Map
<
String
,
Object
>
configMap
,
final
Properties
props
,
final
OrchestrationConfiguration
orchestrationConfig
)
throws
SQLException
{
this
.
orchestrationConfig
=
orchestrationConfig
;
...
...
@@ -39,27 +39,27 @@ public class OrchestrationShardingDataSourceFacoryBean implements FactoryBean<Or
this
.
configMap
=
configMap
;
this
.
props
=
props
;
}
@Override
public
OrchestrationShardingDataSource
getObject
()
throws
Exception
{
return
orchestrationShardingDataSource
;
}
@Override
public
Class
<?>
getObjectType
()
{
return
OrchestrationShardingDataSource
.
class
;
}
@Override
public
boolean
isSingleton
()
{
return
true
;
}
@Override
public
void
afterPropertiesSet
()
throws
Exception
{
orchestrationShardingDataSource
=
(
OrchestrationShardingDataSource
)
OrchestrationShardingDataSourceFactory
.
createDataSource
(
dataSourceMap
,
shardingRuleConfig
,
configMap
,
props
,
orchestrationConfig
);
}
@Override
public
void
destroy
()
throws
Exception
{
orchestrationShardingDataSource
.
close
();
...
...
sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingjdbc/orchestration/spring/namespace/parser/AbstractOrchestrationBeanDefinitionParser.java
浏览文件 @
8d1f1f09
...
...
@@ -29,7 +29,7 @@ import org.w3c.dom.Element;
* @author caohao
*/
public
abstract
class
AbstractOrchestrationBeanDefinitionParser
extends
AbstractBeanDefinitionParser
{
protected
String
parseRegistryCenterRef
(
final
Element
element
)
{
return
element
.
getAttribute
(
"registry-center-ref"
);
}
...
...
sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingjdbc/orchestration/spring/namespace/parser/OrchestrationMasterSlaveDataSourceBeanDefinitionParser.java
浏览文件 @
8d1f1f09
...
...
@@ -73,7 +73,7 @@ public class OrchestrationMasterSlaveDataSourceBeanDefinitionParser extends Abst
}
return
factory
.
getBeanDefinition
();
}
private
AbstractBeanDefinition
getOrchestrationSpringMasterSlaveDataSourceBean
(
final
Element
element
,
final
ParserContext
parserContext
)
{
BeanDefinitionBuilder
factory
=
BeanDefinitionBuilder
.
rootBeanDefinition
(
OrchestrationMasterSlaveDataSourceFacoryBean
.
class
);
String
masterDataSourceRef
=
parseMasterDataSourceRef
(
element
);
...
...
@@ -85,7 +85,7 @@ public class OrchestrationMasterSlaveDataSourceBeanDefinitionParser extends Abst
factory
.
addConstructorArgValue
(
parseOrchestrationConfiguration
(
element
,
OrchestrationConfiguration
.
MASTER_SLAVE
));
return
factory
.
getBeanDefinition
();
}
private
Map
<
String
,
RuntimeBeanReference
>
parseDataSources
(
final
Element
element
)
{
String
masterDataSource
=
parseMasterDataSourceRef
(
element
);
Map
<
String
,
RuntimeBeanReference
>
result
=
new
ManagedMap
<>();
...
...
sharding-jdbc-orchestration-spring/sharding-jdbc-orchestration-spring-namespace/src/main/java/io/shardingjdbc/orchestration/spring/namespace/parser/OrchestrationShardingDataSourceBeanDefinitionParser.java
浏览文件 @
8d1f1f09
...
...
@@ -51,7 +51,7 @@ import java.util.Properties;
* @author zhangliang
*/
public
class
OrchestrationShardingDataSourceBeanDefinitionParser
extends
AbstractOrchestrationBeanDefinitionParser
{
@Override
protected
AbstractBeanDefinition
parseInternal
(
final
Element
element
,
final
ParserContext
parserContext
)
{
String
regCenter
=
parseRegistryCenterRef
(
element
);
...
...
@@ -60,7 +60,7 @@ public class OrchestrationShardingDataSourceBeanDefinitionParser extends Abstrac
}
return
getOrchestrationSpringShardingDataSourceBean
(
element
,
parserContext
);
}
private
AbstractBeanDefinition
getSpringShardingDataSourceBean
(
final
Element
element
,
final
ParserContext
parserContext
)
{
BeanDefinitionBuilder
factory
=
BeanDefinitionBuilder
.
rootBeanDefinition
(
SpringShardingDataSource
.
class
);
factory
.
addConstructorArgValue
(
parseDataSources
(
element
));
...
...
@@ -70,7 +70,7 @@ public class OrchestrationShardingDataSourceBeanDefinitionParser extends Abstrac
factory
.
setDestroyMethodName
(
"close"
);
return
factory
.
getBeanDefinition
();
}
private
AbstractBeanDefinition
getOrchestrationSpringShardingDataSourceBean
(
final
Element
element
,
final
ParserContext
parserContext
)
{
BeanDefinitionBuilder
factory
=
BeanDefinitionBuilder
.
rootBeanDefinition
(
OrchestrationShardingDataSourceFacoryBean
.
class
);
Element
shardingRuleElement
=
DomUtils
.
getChildElementByTagName
(
element
,
ShardingDataSourceBeanDefinitionParserTag
.
SHARDING_RULE_CONFIG_TAG
);
...
...
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/api/OrchestrationMasterSlaveDataSourceFactory.java
浏览文件 @
8d1f1f09
...
...
@@ -43,7 +43,7 @@ import java.util.Map;
*/
@NoArgsConstructor
(
access
=
AccessLevel
.
PRIVATE
)
public
final
class
OrchestrationMasterSlaveDataSourceFactory
{
/**
* Create master-slave data source.
*
...
...
@@ -67,7 +67,7 @@ public final class OrchestrationMasterSlaveDataSourceFactory {
return
createDataSource
(
dataSourceMap
,
masterSlaveRuleConfig
,
configMap
,
orchestrationFacade
);
}
}
/**
* Create master-slave data source.
*
...
...
@@ -89,7 +89,7 @@ public final class OrchestrationMasterSlaveDataSourceFactory {
return
createDataSource
(
dataSourceMap
,
yamlMasterSlaveRuleConfig
.
getMasterSlaveRuleConfiguration
(),
yamlMasterSlaveRuleConfig
.
getConfigMap
(),
orchestrationFacade
);
}
}
/**
* Create master-slave data source.
*
...
...
@@ -107,7 +107,7 @@ public final class OrchestrationMasterSlaveDataSourceFactory {
result
.
init
();
return
result
;
}
/**
* Create master-slave data source.
*
...
...
@@ -122,7 +122,7 @@ public final class OrchestrationMasterSlaveDataSourceFactory {
YamlOrchestrationMasterSlaveRuleConfiguration
config
=
unmarshal
(
yamlFile
);
return
createDataSource
(
config
.
getDataSources
(),
config
.
getMasterSlaveRule
(),
config
.
getOrchestration
().
getOrchestrationConfiguration
());
}
/**
* Create master-slave data source.
*
...
...
@@ -138,7 +138,7 @@ public final class OrchestrationMasterSlaveDataSourceFactory {
YamlOrchestrationMasterSlaveRuleConfiguration
config
=
unmarshal
(
yamlFile
);
return
createDataSource
(
dataSourceMap
,
config
.
getMasterSlaveRule
(),
config
.
getOrchestration
().
getOrchestrationConfiguration
());
}
/**
* Create master-slave data source.
*
...
...
@@ -152,7 +152,7 @@ public final class OrchestrationMasterSlaveDataSourceFactory {
YamlOrchestrationMasterSlaveRuleConfiguration
config
=
unmarshal
(
yamlByteArray
);
return
createDataSource
(
config
.
getDataSources
(),
config
.
getMasterSlaveRule
(),
config
.
getOrchestration
().
getOrchestrationConfiguration
());
}
/**
* Create master-slave data source.
*
...
...
@@ -167,7 +167,7 @@ public final class OrchestrationMasterSlaveDataSourceFactory {
YamlOrchestrationMasterSlaveRuleConfiguration
config
=
unmarshal
(
yamlByteArray
);
return
createDataSource
(
dataSourceMap
,
config
.
getMasterSlaveRule
(),
config
.
getOrchestration
().
getOrchestrationConfiguration
());
}
private
static
YamlOrchestrationMasterSlaveRuleConfiguration
unmarshal
(
final
File
yamlFile
)
throws
IOException
{
try
(
FileInputStream
fileInputStream
=
new
FileInputStream
(
yamlFile
);
...
...
@@ -176,7 +176,7 @@ public final class OrchestrationMasterSlaveDataSourceFactory {
return
new
Yaml
(
new
Constructor
(
YamlOrchestrationMasterSlaveRuleConfiguration
.
class
)).
loadAs
(
inputStreamReader
,
YamlOrchestrationMasterSlaveRuleConfiguration
.
class
);
}
}
private
static
YamlOrchestrationMasterSlaveRuleConfiguration
unmarshal
(
final
byte
[]
yamlByteArray
)
{
return
new
Yaml
(
new
Constructor
(
YamlOrchestrationMasterSlaveRuleConfiguration
.
class
)).
loadAs
(
new
ByteArrayInputStream
(
yamlByteArray
),
YamlOrchestrationMasterSlaveRuleConfiguration
.
class
);
}
...
...
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/api/OrchestrationShardingDataSourceFactory.java
浏览文件 @
8d1f1f09
...
...
@@ -52,7 +52,7 @@ import java.util.Properties;
*/
@NoArgsConstructor
(
access
=
AccessLevel
.
PRIVATE
)
public
final
class
OrchestrationShardingDataSourceFactory
{
/**
* Create sharding data source.
*
...
...
@@ -77,7 +77,7 @@ public final class OrchestrationShardingDataSourceFactory {
return
createDataSource
(
dataSourceMap
,
shardingRuleConfig
,
configMap
,
props
,
orchestrationFacade
);
}
}
/**
* Create sharding data source.
*
...
...
@@ -99,7 +99,7 @@ public final class OrchestrationShardingDataSourceFactory {
return
createDataSource
(
dataSourceMap
,
yamlShardingRuleConfig
.
getShardingRuleConfiguration
(),
yamlShardingRuleConfig
.
getConfigMap
(),
yamlShardingRuleConfig
.
getProps
(),
orchestrationFacade
);
}
}
/**
* Create sharding data source.
*
...
...
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/api/config/OrchestrationConfiguration.java
浏览文件 @
8d1f1f09
...
...
@@ -29,10 +29,10 @@ import lombok.RequiredArgsConstructor;
@RequiredArgsConstructor
@Getter
public
final
class
OrchestrationConfiguration
{
public
static
final
String
MASTER_SLAVE
=
"masterslave"
;
public
static
final
String
SHARDING
=
"sharding"
;
private
final
String
name
;
private
final
RegistryCenterConfiguration
regCenterConfig
;
...
...
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/internal/OrchestrationFacade.java
浏览文件 @
8d1f1f09
...
...
@@ -52,7 +52,7 @@ import java.util.Properties;
public
final
class
OrchestrationFacade
implements
AutoCloseable
{
private
final
boolean
isOverwrite
;
@Getter
private
final
ConfigurationService
configService
;
...
...
@@ -83,7 +83,7 @@ public final class OrchestrationFacade implements AutoCloseable {
}
throw
new
UnsupportedOperationException
(
regCenterConfig
.
getClass
().
getName
());
}
/**
* Initialize for sharding orchestration.
*
...
...
sharding-jdbc-orchestration/src/main/java/io/shardingjdbc/orchestration/yaml/YamlOrchestrationConfiguration.java
浏览文件 @
8d1f1f09
...
...
@@ -39,7 +39,7 @@ public class YamlOrchestrationConfiguration {
private
ZookeeperConfiguration
zookeeper
;
private
boolean
overwrite
;
private
String
type
;
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录