DruidFilterUtils refactor

This commit is contained in:
wenshao
2012-07-20 08:51:45 +08:00
parent 5c86bad978
commit a0ebb09690
7 changed files with 161 additions and 211 deletions
@@ -25,9 +25,7 @@ import junit.framework.TestCase;
import com.alibaba.druid.bvt.proxy.DruidDriverTest.PublicJdbcFilterAdapter;
import com.alibaba.druid.filter.Filter;
import com.alibaba.druid.proxy.config.AbstractDruidFilterConfig;
import com.alibaba.druid.proxy.config.DruidFilterConfig;
import com.alibaba.druid.util.DruidLoaderUtils;
import com.alibaba.druid.util.DruidFilterUtils;
/**
* druidLoader util 测试
@@ -41,42 +39,42 @@ public class DruidLoaderUtilsTest extends TestCase {
List<Filter> filters = new ArrayList<Filter>();
// log4j
String filterItem = "log4j";
DruidLoaderUtils.loadFilter(filters, filterItem);
DruidFilterUtils.loadFilter(filters, filterItem);
Filter filterConfig = filters.get(0);
Assert.assertNotNull(filterConfig);
Assert.assertEquals("com.alibaba.druid.filter.logging.Log4jFilter", filterConfig.getClass().getName());
// stat
filterItem = "stat";
filters.clear();
DruidLoaderUtils.loadFilter(filters, filterItem);
DruidFilterUtils.loadFilter(filters, filterItem);
filterConfig = filters.get(0);
Assert.assertNotNull(filterConfig);
Assert.assertEquals("com.alibaba.druid.filter.stat.StatFilter", filterConfig.getClass().getName());
// default
filterItem = "default";
filters.clear();
DruidLoaderUtils.loadFilter(filters, filterItem);
DruidFilterUtils.loadFilter(filters, filterItem);
filterConfig = filters.get(0);
Assert.assertNotNull(filterConfig);
Assert.assertEquals("com.alibaba.druid.filter.stat.StatFilter", filterConfig.getClass().getName());
// counter
filterItem = "stat";
filters.clear();
DruidLoaderUtils.loadFilter(filters, filterItem);
DruidFilterUtils.loadFilter(filters, filterItem);
filterConfig = filters.get(0);
Assert.assertNotNull(filterConfig);
Assert.assertEquals("com.alibaba.druid.filter.stat.StatFilter", filterConfig.getClass().getName());
// commonLogging
filterItem = "commonLogging";
filters.clear();
DruidLoaderUtils.loadFilter(filters, filterItem);
DruidFilterUtils.loadFilter(filters, filterItem);
filterConfig = filters.get(0);
Assert.assertNotNull(filterConfig);
Assert.assertEquals("com.alibaba.druid.filter.logging.CommonsLogFilter", filterConfig.getClass().getName());
// encoding
filterItem = "encoding";
filters.clear();
DruidLoaderUtils.loadFilter(filters, filterItem);
DruidFilterUtils.loadFilter(filters, filterItem);
filterConfig = filters.get(0);
Assert.assertNotNull(filterConfig);
Assert.assertEquals("com.alibaba.druid.filter.encoding.EncodingConvertFilter",
@@ -84,9 +82,9 @@ public class DruidLoaderUtilsTest extends TestCase {
// 判定重复
filterItem = "stat";
filters.clear();
DruidLoaderUtils.loadFilter(filters, filterItem);
DruidFilterUtils.loadFilter(filters, filterItem);
filterItem = "default";
DruidLoaderUtils.loadFilter(filters, filterItem);
DruidFilterUtils.loadFilter(filters, filterItem);
for (Iterator<Filter> iterator = filters.iterator(); iterator.hasNext();) {
Filter filter = (Filter) iterator.next();
System.out.println(filter.getClass().getName());
@@ -94,29 +92,13 @@ public class DruidLoaderUtilsTest extends TestCase {
// default
}
public void testLoadFilter2() throws SQLException {
List<Filter> filterConfigList = new ArrayList<Filter>();
List<AbstractDruidFilterConfig> druidFilterConfigList = new ArrayList<AbstractDruidFilterConfig>();
DruidFilterConfig druidFilterConfig = new DruidFilterConfig();
druidFilterConfig.setClazz("com.alibaba.druid.filter.logging.Log4jFilter");
druidFilterConfig.setName("log4j");
druidFilterConfigList.add(druidFilterConfig);
// log4j
DruidLoaderUtils.loadFilter(filterConfigList, druidFilterConfigList);
Filter filterConfig = filterConfigList.get(0);
Assert.assertNotNull(filterConfig);
Assert.assertEquals("com.alibaba.druid.filter.logging.Log4jFilter", filterConfig.getClass().getName());
}
public void twest_loadClass() throws Exception {
Assert.assertEquals(null, DruidLoaderUtils.loadClass(null));
Assert.assertEquals(null, DruidLoaderUtils.loadClass("xxx"));
Assert.assertEquals(null, DruidFilterUtils.loadClass(null));
Assert.assertEquals(null, DruidFilterUtils.loadClass("xxx"));
Assert.assertEquals(PublicJdbcFilterAdapter.class,
DruidLoaderUtils.loadClass(PublicJdbcFilterAdapter.class.getName()));
Assert.assertNull(DruidLoaderUtils.loadClass(null));
Assert.assertNull(DruidLoaderUtils.loadClass(""));
DruidFilterUtils.loadClass(PublicJdbcFilterAdapter.class.getName()));
Assert.assertNull(DruidFilterUtils.loadClass(null));
Assert.assertNull(DruidFilterUtils.loadClass(""));
}
}