diff --git a/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarConfigLoader.java b/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarConfigLoader.java index 8c55b633d5..513d987ce2 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarConfigLoader.java +++ b/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarConfigLoader.java @@ -28,9 +28,13 @@ public class CobarConfigLoader extends URLConnectionConfigLoader implements Conf public CobarDataSource getDataSource() { return dataSource; } + + public static boolean isCobar(String url) { + return url.startsWith("jdbc:cobar://"); + } public static URL createURL(String jdbcUrl) throws SQLException { - if (!CobarDataSource.isCobar(jdbcUrl)) { + if (!isCobar(jdbcUrl)) { throw new SQLException("illegal cobar url"); } diff --git a/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarDataSource.java b/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarDataSource.java index 8780dee8de..1a74993625 100644 --- a/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/ha/cobar/CobarDataSource.java @@ -9,9 +9,7 @@ import com.alibaba.druid.logging.Log; import com.alibaba.druid.logging.LogFactory; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.druid.pool.ha.DataSourceHolder; -import com.alibaba.druid.pool.ha.MultiConnectionHolder; import com.alibaba.druid.pool.ha.MultiDataSource; -import com.alibaba.druid.pool.ha.MultiDataSourceConnection; import com.alibaba.druid.util.JdbcUtils; public class CobarDataSource extends MultiDataSource { @@ -27,8 +25,6 @@ public class CobarDataSource extends MultiDataSource { private List proxyFilters = new ArrayList(); private String filters; - - public CobarDataSource(){ } @@ -78,7 +74,7 @@ public class CobarDataSource extends MultiDataSource { throw new SQLException(""); } - if (isCobar(url)) { + if (CobarConfigLoader.isCobar(url)) { this.setConfigLoader(new CobarConfigLoader(this)); } else { DataSourceHolder holder = createDataSourceHolder(this.url, 1); @@ -106,14 +102,4 @@ public class CobarDataSource extends MultiDataSource { JdbcUtils.close(holder); } - public static boolean isCobar(String url) { - return url.startsWith("jdbc:cobar://"); - } - - @Override - public MultiConnectionHolder getConnectionInternal(MultiDataSourceConnection conn, String sql) throws SQLException { - - return null; - } - }