From f162238125bd6ed30bdb8e9e7b0a587cf1c81d84 Mon Sep 17 00:00:00 2001 From: wenshao Date: Thu, 30 Aug 2012 05:58:05 +0800 Subject: [PATCH] remove unused code --- .../encoding/EncodingConvertFilter.java | 10 ----- .../config/AbstractDruidFilterConfig.java | 42 ----------------- .../druid/proxy/config/DruidFilterConfig.java | 23 ---------- .../config/EncodingDruidFilterConfig.java | 45 ------------------- .../spring/stat/BeanTypeAutoProxyCreator.java | 1 - .../druid/bvt/proxy/DruidDriverTest.java | 1 - 6 files changed, 122 deletions(-) delete mode 100644 src/main/java/com/alibaba/druid/proxy/config/AbstractDruidFilterConfig.java delete mode 100644 src/main/java/com/alibaba/druid/proxy/config/DruidFilterConfig.java delete mode 100644 src/main/java/com/alibaba/druid/proxy/config/EncodingDruidFilterConfig.java diff --git a/src/main/java/com/alibaba/druid/filter/encoding/EncodingConvertFilter.java b/src/main/java/com/alibaba/druid/filter/encoding/EncodingConvertFilter.java index 97d8afb07b..96a5428ce0 100644 --- a/src/main/java/com/alibaba/druid/filter/encoding/EncodingConvertFilter.java +++ b/src/main/java/com/alibaba/druid/filter/encoding/EncodingConvertFilter.java @@ -26,8 +26,6 @@ import java.util.Properties; import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.filter.FilterChain; -import com.alibaba.druid.proxy.config.AbstractDruidFilterConfig; -import com.alibaba.druid.proxy.config.EncodingDruidFilterConfig; import com.alibaba.druid.proxy.jdbc.CallableStatementProxy; import com.alibaba.druid.proxy.jdbc.ClobProxy; import com.alibaba.druid.proxy.jdbc.ConnectionProxy; @@ -46,14 +44,6 @@ public class EncodingConvertFilter extends FilterAdapter { private String clientEncoding; private String serverEncoding; - public void loadConfig(AbstractDruidFilterConfig druidFilterConfig) { - EncodingDruidFilterConfig druidEncodingFilterConfig = (EncodingDruidFilterConfig) druidFilterConfig; - if (druidEncodingFilterConfig != null) { - clientEncoding = druidEncodingFilterConfig.getClientEncoding(); - serverEncoding = druidEncodingFilterConfig.getServerEncoding(); - } - } - public ConnectionProxy connection_connect(FilterChain chain, Properties info) throws SQLException { ConnectionProxy conn = chain.connection_connect(info); diff --git a/src/main/java/com/alibaba/druid/proxy/config/AbstractDruidFilterConfig.java b/src/main/java/com/alibaba/druid/proxy/config/AbstractDruidFilterConfig.java deleted file mode 100644 index 8f880b0162..0000000000 --- a/src/main/java/com/alibaba/druid/proxy/config/AbstractDruidFilterConfig.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 1999-2011 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.druid.proxy.config; - -/** - * @author gang.su - */ -public abstract class AbstractDruidFilterConfig { - - private String name; - private String clazz; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getClazz() { - return clazz; - } - - public void setClazz(String clazz) { - this.clazz = clazz; - } - -} diff --git a/src/main/java/com/alibaba/druid/proxy/config/DruidFilterConfig.java b/src/main/java/com/alibaba/druid/proxy/config/DruidFilterConfig.java deleted file mode 100644 index e747d3bbe5..0000000000 --- a/src/main/java/com/alibaba/druid/proxy/config/DruidFilterConfig.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 1999-2011 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.druid.proxy.config; - -/** - * @author gang.su - */ -public class DruidFilterConfig extends AbstractDruidFilterConfig { - -} diff --git a/src/main/java/com/alibaba/druid/proxy/config/EncodingDruidFilterConfig.java b/src/main/java/com/alibaba/druid/proxy/config/EncodingDruidFilterConfig.java deleted file mode 100644 index 878fbb88b1..0000000000 --- a/src/main/java/com/alibaba/druid/proxy/config/EncodingDruidFilterConfig.java +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 1999-2011 Alibaba Group Holding Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.alibaba.druid.proxy.config; - -/** - * druid filter配置 来源于配置文件 - * - * @author gang.su - */ -public class EncodingDruidFilterConfig extends AbstractDruidFilterConfig { - - private String clientEncoding; - - private String serverEncoding; - - public String getClientEncoding() { - return clientEncoding; - } - - public void setClientEncoding(String clientEncoding) { - this.clientEncoding = clientEncoding; - } - - public String getServerEncoding() { - return serverEncoding; - } - - public void setServerEncoding(String serverEncoding) { - this.serverEncoding = serverEncoding; - } - -} diff --git a/src/main/java/com/alibaba/druid/support/spring/stat/BeanTypeAutoProxyCreator.java b/src/main/java/com/alibaba/druid/support/spring/stat/BeanTypeAutoProxyCreator.java index 6ce7f98813..968f7e701d 100644 --- a/src/main/java/com/alibaba/druid/support/spring/stat/BeanTypeAutoProxyCreator.java +++ b/src/main/java/com/alibaba/druid/support/spring/stat/BeanTypeAutoProxyCreator.java @@ -21,7 +21,6 @@ import java.util.List; 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; diff --git a/src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java b/src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java index 35cc17c2ef..dd1346eab4 100644 --- a/src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java +++ b/src/test/java/com/alibaba/druid/bvt/proxy/DruidDriverTest.java @@ -23,7 +23,6 @@ import junit.framework.TestCase; import com.alibaba.druid.filter.FilterAdapter; import com.alibaba.druid.mock.MockDriver; import com.alibaba.druid.proxy.DruidDriver; -import com.alibaba.druid.proxy.config.AbstractDruidFilterConfig; import com.alibaba.druid.proxy.jdbc.ConnectionProxyImpl; import com.alibaba.druid.util.JdbcUtils;