Commit fff260bb by qiuweili123

format

parent 89ecec02
......@@ -13,7 +13,6 @@ import javax.sql.DataSource;
import java.lang.reflect.Method;
import java.sql.Connection;
import java.sql.SQLException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.locks.Lock;
......@@ -24,10 +23,10 @@ public abstract class AbsDataSource extends AbstractDataSource implements Dispos
private static Lock lock = new ReentrantLock();
private static DataSourceProvider dataSourceProvider = ServiceLoaderFactory.getInstance(DataSourceProvider.class);
private static DataSourceProvider dataSourceProvider = ServiceLoaderFactory.getInstance(DataSourceProvider.class);
@Getter
private static Map<String, DataSource> dataSourceMap=dataSourceProvider.loadDataSources();
private static Map<String, DataSource> dataSourceMap = dataSourceProvider.loadDataSources();
public AbsDataSource() {
......@@ -63,8 +62,8 @@ public abstract class AbsDataSource extends AbstractDataSource implements Dispos
public void destroy() throws Exception {
List<String> removeDsNames = getRemoveDsNames();
for (String dsName:removeDsNames){
log.info("datasource {} start closing ....",dsName);
for (String dsName : removeDsNames) {
log.info("datasource {} start closing ....", dsName);
DataSource dataSource = dataSourceMap.get(dsName);
Class<? extends DataSource> clazz = dataSource.getClass();
try {
......@@ -74,7 +73,7 @@ public abstract class AbsDataSource extends AbstractDataSource implements Dispos
log.warn("datasource close the datasource named [{}] failed,", dsName);
}
removeDataSource(dsName);
log.info("datasource {} closed success",dsName);
log.info("datasource {} closed success", dsName);
}
}
......@@ -96,12 +95,12 @@ public abstract class AbsDataSource extends AbstractDataSource implements Dispos
}
protected abstract DataSource getDataSource();
/**
* 确定要清除的数据源名称
*
* @return
*/
protected abstract List<String> getRemoveDsNames();
protected abstract List<String> getRemoveDsNames();
}
package com.secoo.mall.datasource.bean;
import com.google.common.collect.Lists;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import javax.sql.DataSource;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.List;
......@@ -19,7 +17,7 @@ public class MatrixDataSource extends AbsDataSource {
private String dsName;
public MatrixDataSource(){
public MatrixDataSource() {
}
......
......@@ -4,10 +4,8 @@ import com.secoo.mall.datasource.holder.DataSourceContextHolder;
import lombok.extern.slf4j.Slf4j;
import javax.sql.DataSource;
import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* 此数据源为支持@selectDataSource注解的多数据源使用
......
......@@ -2,8 +2,6 @@ package com.secoo.mall.datasource.config;
import lombok.Data;
import java.util.Properties;
@Data
public class MatrixDataSourceConfig implements DataSourceConfig {
......
......@@ -8,7 +8,6 @@ public class MatrixDataSourceProperties extends MatrixDataSourceConfig {
public static final String PREFIX = "spring.datasource.matrix";
public MatrixDataSourceProperties() {
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment