Alawn/druid-spring-boot
1
0
Fork 0
mirror of https://github.com/drtrang/druid-spring-boot.git synced 2026-11-02 23:23:41 +00:00
Code Issues Releases Wiki Activity

将数据源名称改为驼峰

Browse Source
This commit is contained in:
trang
2017-11-23 18:16:13 +08:00
parent fc7402f019
commit e5f704c1cd
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/DruidDataSourceConfiguration.java
+9 -11
View File
@@ -75,21 +75,19 @@ public class DruidDataSourceConfiguration {
.setDestroyMethodName("close")
.getBeanDefinition();
// 注册 BeanDefinition
registry.registerBeanDefinition(dataSourceName, beanDefinition);
// 注册驼峰别名
String camelAlias = CharMatcher.separatedToCamel().apply(dataSourceName);
registry.registerAlias(dataSourceName, camelAlias);
String camelName = CharMatcher.separatedToCamel().apply(dataSourceName);
registry.registerBeanDefinition(camelName, beanDefinition);
// 注册以 DataSource 为后缀的别名
String otherAlias;
if (camelAlias.toLowerCase().endsWith(BEAN_SUFFIX.toLowerCase())) {
if (!camelAlias.endsWith(BEAN_SUFFIX)) {
otherAlias = camelAlias.substring(0, camelAlias.toLowerCase().indexOf(BEAN_SUFFIX.toLowerCase()));
if (camelName.toLowerCase().endsWith(BEAN_SUFFIX.toLowerCase())) {
if (!camelName.endsWith(BEAN_SUFFIX)) {
otherAlias = camelName.substring(0, camelName.toLowerCase().indexOf(BEAN_SUFFIX.toLowerCase()));
otherAlias = otherAlias + BEAN_SUFFIX;
registry.registerAlias(dataSourceName, otherAlias);
registry.registerAlias(camelName, otherAlias);
}
} else {
otherAlias = camelAlias + BEAN_SUFFIX;
registry.registerAlias(dataSourceName, otherAlias);
otherAlias = camelName + BEAN_SUFFIX;
registry.registerAlias(camelName, otherAlias);
}
log.debug("druid {}-data-source init...", dataSourceName);
});
@@ -132,7 +130,7 @@ public class DruidDataSourceConfiguration {
}
/**
* DataSource Bean 处理器
* DataSource Bean 处理器，将各数据源的自定义配置绑定到 Spring Bean
*
* @author trang
*/
druid-spring-boot/druid-spring-boot-autoconfigure/src/main/java/com/github/trang/druid/autoconfigure/properties/DruidDataSourceProperties.java
+2 -2
View File
@@ -1,6 +1,6 @@
package com.github.trang.druid.autoconfigure.properties;
import com.github.trang.druid.autoconfigure.datasource.DruidDataSource2;
import com.alibaba.druid.pool.DruidDataSource;
import lombok.Getter;
import lombok.Setter;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -36,7 +36,7 @@ public class DruidDataSourceProperties {
DruidStatViewServletProperties statViewServlet = new DruidStatViewServletProperties();
DruidWebStatProperties webStat = new DruidWebStatProperties();
DruidAopStatProperties aopStat = new DruidAopStatProperties();
Map<String, DruidDataSource2> dataSources = new HashMap<>(16);
Map<String, DruidDataSource> dataSources = new HashMap<>(16);
@Getter
@Setter