diff --git a/druid-log.jpg b/druid-log.jpg new file mode 100644 index 0000000000..2928e9446b Binary files /dev/null and b/druid-log.jpg differ diff --git a/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanTypeAutoProxyCreator.java b/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanTypeAutoProxyCreator.java index 46144b2d21..c76ce574eb 100644 --- a/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanTypeAutoProxyCreator.java +++ b/src/main/java/com/alibaba/druid/support/ibatis/SpringIbatisBeanTypeAutoProxyCreator.java @@ -23,13 +23,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.aop.TargetSource; import org.springframework.aop.framework.autoproxy.AbstractAutoProxyCreator; -import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.FactoryBean; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.context.ApplicationContext; -import org.springframework.context.ApplicationContextAware; -import org.springframework.util.Assert; import org.springframework.util.PatternMatchUtils; import com.ibatis.sqlmap.client.SqlMapClient; @@ -41,30 +36,15 @@ import com.ibatis.sqlmap.engine.impl.ExtendedSqlMapClient; * @author hualiang.lihl 2011-12-31 上午10:48:20 */ @SuppressWarnings("deprecation") -public class SpringIbatisBeanTypeAutoProxyCreator extends AbstractAutoProxyCreator implements InitializingBean, ApplicationContextAware, SpringIbatisBeanTypeAutoProxyCreatorMBean { +public class SpringIbatisBeanTypeAutoProxyCreator extends AbstractAutoProxyCreator implements SpringIbatisBeanTypeAutoProxyCreatorMBean { private final static Log LOG = LogFactory.getLog(SpringIbatisBeanTypeAutoProxyCreator.class); private static final long serialVersionUID = -9094985530794052264L; - private Class targetBeanType = SqlMapClient.class; - - private ApplicationContext context; - private List beanNames = new ArrayList(); private final List proxyBeanNames = new ArrayList(); - /** - * @param targetClass the targetClass to set - */ - public void setTargetBeanType(Class targetClass) { - this.targetBeanType = targetClass; - } - - public void setApplicationContext(ApplicationContext context) throws BeansException { - this.context = context; - } - /** * Identify as bean to proxy if the bean name is in the configured list of names. */ @@ -124,14 +104,6 @@ public class SpringIbatisBeanTypeAutoProxyCreator extends AbstractAutoProxyCreat return PatternMatchUtils.simpleMatch(mappedName, beanName); } - public void afterPropertiesSet() throws Exception { - Assert.notNull(targetBeanType, "targetType cannot be null"); - String[] beanNames = context.getBeanNamesForType(targetBeanType); - for (String name : beanNames) { - this.beanNames.add(name); - } - } - public List getBeanNames() { return beanNames; } diff --git a/src/test/resources/com/alibaba/druid/pool/mybatis/spring-config-mybatis.xml b/src/test/resources/com/alibaba/druid/pool/mybatis/spring-config-mybatis.xml index bc802baddd..5a37a84223 100644 --- a/src/test/resources/com/alibaba/druid/pool/mybatis/spring-config-mybatis.xml +++ b/src/test/resources/com/alibaba/druid/pool/mybatis/spring-config-mybatis.xml @@ -12,6 +12,18 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/ + + + + + + + + sqlSessionFactory + + + +