提交 8d1f1f09 编写于 作者: M maxiaoguang

根据sj代码规范修改代码

上级 e0d3f702
......@@ -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();
......
......@@ -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();
......
......@@ -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");
}
......
......@@ -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<>();
......
......@@ -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);
......
......@@ -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);
}
......
......@@ -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.
*
......
......@@ -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;
......
......@@ -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.
*
......
......@@ -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.
先完成此消息的编辑!
想要评论请 注册