diff --git a/infra/common/pom.xml b/infra/common/pom.xml index 95e8d9bc3811c..e73e40518edc0 100644 --- a/infra/common/pom.xml +++ b/infra/common/pom.xml @@ -88,11 +88,6 @@ shardingsphere-infra-data-source-pool-dbcp ${project.version} - - org.apache.shardingsphere - shardingsphere-infra-data-source-pool-c3p0 - ${project.version} - org.apache.shardingsphere shardingsphere-parser-sql-engine diff --git a/infra/data-source-pool/type/c3p0/pom.xml b/infra/data-source-pool/type/c3p0/pom.xml deleted file mode 100644 index 5b074c97578df..0000000000000 --- a/infra/data-source-pool/type/c3p0/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - 4.0.0 - - org.apache.shardingsphere - shardingsphere-infra-data-source-pool-type - 5.4.1-SNAPSHOT - - shardingsphere-infra-data-source-pool-c3p0 - ${project.artifactId} - - - - org.apache.shardingsphere - shardingsphere-infra-data-source-pool-core - ${project.version} - - - - com.mchange - c3p0 - - - - org.apache.shardingsphere - shardingsphere-test-fixture-database - ${project.version} - test - - - org.apache.shardingsphere - shardingsphere-test-util - ${project.version} - test - - - diff --git a/infra/data-source-pool/type/c3p0/src/main/java/org/apache/shardingsphere/infra/datasource/pool/c3p0/metadata/C3P0DataSourcePoolFieldMetaData.java b/infra/data-source-pool/type/c3p0/src/main/java/org/apache/shardingsphere/infra/datasource/pool/c3p0/metadata/C3P0DataSourcePoolFieldMetaData.java deleted file mode 100644 index 959e61c488a8d..0000000000000 --- a/infra/data-source-pool/type/c3p0/src/main/java/org/apache/shardingsphere/infra/datasource/pool/c3p0/metadata/C3P0DataSourcePoolFieldMetaData.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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 org.apache.shardingsphere.infra.datasource.pool.c3p0.metadata; - -import org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolFieldMetaData; - -/** - * C3P0 data source pool field meta data. - */ -public final class C3P0DataSourcePoolFieldMetaData implements DataSourcePoolFieldMetaData { - - @Override - public String getJdbcUrlFieldName() { - return "jdbcUrl"; - } - - @Override - public String getJdbcUrlPropertiesFieldName() { - return "properties"; - } -} diff --git a/infra/data-source-pool/type/c3p0/src/main/java/org/apache/shardingsphere/infra/datasource/pool/c3p0/metadata/C3P0DataSourcePoolMetaData.java b/infra/data-source-pool/type/c3p0/src/main/java/org/apache/shardingsphere/infra/datasource/pool/c3p0/metadata/C3P0DataSourcePoolMetaData.java deleted file mode 100644 index 66027a8688ae5..0000000000000 --- a/infra/data-source-pool/type/c3p0/src/main/java/org/apache/shardingsphere/infra/datasource/pool/c3p0/metadata/C3P0DataSourcePoolMetaData.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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 org.apache.shardingsphere.infra.datasource.pool.c3p0.metadata; - -import org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolMetaData; - -import java.util.Collection; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.Map; - -/** - * C3P0 data source pool meta data. - */ -public final class C3P0DataSourcePoolMetaData implements DataSourcePoolMetaData { - - private static final Map DEFAULT_PROPS = new HashMap<>(6, 1F); - - private static final Map SKIPPED_PROPS = new HashMap<>(2, 1F); - - private static final Map PROP_SYNONYMS = new HashMap<>(5, 1F); - - private static final Collection TRANSIENT_FIELD_NAMES = new LinkedList<>(); - - static { - buildDefaultProperties(); - buildInvalidProperties(); - buildPropertySynonyms(); - buildTransientFieldNames(); - } - - private static void buildDefaultProperties() { - DEFAULT_PROPS.put("checkoutTimeout", 20 * 1000L); - DEFAULT_PROPS.put("maxIdleTime", 60 * 1000L); - DEFAULT_PROPS.put("maxIdleTimeExcessConnections", 30 * 70 * 1000L); - DEFAULT_PROPS.put("maxPoolSize", 15); - DEFAULT_PROPS.put("minPoolSize", 3); - DEFAULT_PROPS.put("readOnly", false); - } - - private static void buildInvalidProperties() { - SKIPPED_PROPS.put("minPoolSize", -1); - SKIPPED_PROPS.put("maxPoolSize", -1); - } - - private static void buildPropertySynonyms() { - PROP_SYNONYMS.put("username", "user"); - PROP_SYNONYMS.put("url", "jdbcUrl"); - PROP_SYNONYMS.put("connectionTimeoutMilliseconds", "checkoutTimeout"); - PROP_SYNONYMS.put("idleTimeoutMilliseconds", "maxIdleTime"); - PROP_SYNONYMS.put("maxLifetimeMilliseconds", "maxIdleTimeExcessConnections"); - } - - private static void buildTransientFieldNames() { - TRANSIENT_FIELD_NAMES.add("running"); - TRANSIENT_FIELD_NAMES.add("closed"); - } - - @Override - public Map getDefaultProperties() { - return DEFAULT_PROPS; - } - - @Override - public Map getSkippedProperties() { - return SKIPPED_PROPS; - } - - @Override - public Map getPropertySynonyms() { - return PROP_SYNONYMS; - } - - @Override - public Collection getTransientFieldNames() { - return TRANSIENT_FIELD_NAMES; - } - - @Override - public C3P0DataSourcePoolFieldMetaData getFieldMetaData() { - return new C3P0DataSourcePoolFieldMetaData(); - } - - @Override - public String getType() { - return "com.mchange.v2.c3p0.ComboPooledDataSource"; - } -} diff --git a/infra/data-source-pool/type/c3p0/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolMetaData b/infra/data-source-pool/type/c3p0/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolMetaData deleted file mode 100644 index 7aaac6f4b147e..0000000000000 --- a/infra/data-source-pool/type/c3p0/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolMetaData +++ /dev/null @@ -1,18 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You 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. -# - -org.apache.shardingsphere.infra.datasource.pool.c3p0.metadata.C3P0DataSourcePoolMetaData diff --git a/infra/data-source-pool/type/c3p0/src/test/java/org/apache/shardingsphere/infra/datasource/pool/c3p0/creator/C3P0DataSourcePoolCreatorTest.java b/infra/data-source-pool/type/c3p0/src/test/java/org/apache/shardingsphere/infra/datasource/pool/c3p0/creator/C3P0DataSourcePoolCreatorTest.java deleted file mode 100644 index 1fb156bd1e973..0000000000000 --- a/infra/data-source-pool/type/c3p0/src/test/java/org/apache/shardingsphere/infra/datasource/pool/c3p0/creator/C3P0DataSourcePoolCreatorTest.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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 org.apache.shardingsphere.infra.datasource.pool.c3p0.creator; - -import com.mchange.v2.c3p0.ComboPooledDataSource; -import org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator; -import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties; -import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource; -import org.apache.shardingsphere.test.util.PropertiesBuilder; -import org.junit.jupiter.api.Test; - -import java.util.HashMap; -import java.util.Map; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; - -class C3P0DataSourcePoolCreatorTest { - - @Test - void assertCreateDataSource() { - ComboPooledDataSource actual = (ComboPooledDataSource) DataSourcePoolCreator.create(new DataSourcePoolProperties(ComboPooledDataSource.class.getName(), createDataSourcePoolProperties())); - assertThat(actual.getJdbcUrl(), is("jdbc:mock://127.0.0.1/foo_ds")); - assertThat(actual.getUser(), is("root")); - assertThat(actual.getPassword(), is("root")); - assertThat(actual.getProperties(), is(PropertiesBuilder.build(new PropertiesBuilder.Property("foo", "foo_value"), new PropertiesBuilder.Property("bar", "bar_value"), - new PropertiesBuilder.Property("password", "root"), new PropertiesBuilder.Property("user", "root")))); - } - - private Map createDataSourcePoolProperties() { - Map result = new HashMap<>(); - result.put("url", "jdbc:mock://127.0.0.1/foo_ds"); - result.put("driverClassName", MockedDataSource.class.getName()); - result.put("username", "root"); - result.put("password", "root"); - result.put("properties", PropertiesBuilder.build(new PropertiesBuilder.Property("foo", "foo_value"), new PropertiesBuilder.Property("bar", "bar_value"))); - return result; - } -} diff --git a/infra/data-source-pool/type/dbcp/pom.xml b/infra/data-source-pool/type/dbcp/pom.xml deleted file mode 100644 index b3e5a8f86d872..0000000000000 --- a/infra/data-source-pool/type/dbcp/pom.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - 4.0.0 - - org.apache.shardingsphere - shardingsphere-infra-data-source-pool-type - 5.4.1-SNAPSHOT - - shardingsphere-infra-data-source-pool-dbcp - ${project.artifactId} - - - - org.apache.shardingsphere - shardingsphere-infra-data-source-pool-core - ${project.version} - - - - org.apache.commons - commons-dbcp2 - - - - org.apache.shardingsphere - shardingsphere-test-fixture-database - ${project.version} - test - - - org.apache.shardingsphere - shardingsphere-test-util - ${project.version} - test - - - diff --git a/infra/data-source-pool/type/dbcp/src/main/java/org/apache/shardingsphere/infra/datasource/pool/dbcp/metadata/DBCPDataSourcePoolFieldMetaData.java b/infra/data-source-pool/type/dbcp/src/main/java/org/apache/shardingsphere/infra/datasource/pool/dbcp/metadata/DBCPDataSourcePoolFieldMetaData.java deleted file mode 100644 index cec9416df9f1e..0000000000000 --- a/infra/data-source-pool/type/dbcp/src/main/java/org/apache/shardingsphere/infra/datasource/pool/dbcp/metadata/DBCPDataSourcePoolFieldMetaData.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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 org.apache.shardingsphere.infra.datasource.pool.dbcp.metadata; - -import org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolFieldMetaData; - -/** - * DBCP data source pool field meta data. - */ -public final class DBCPDataSourcePoolFieldMetaData implements DataSourcePoolFieldMetaData { - - @Override - public String getJdbcUrlFieldName() { - return "url"; - } - - @Override - public String getJdbcUrlPropertiesFieldName() { - return "connectionProperties"; - } -} diff --git a/infra/data-source-pool/type/dbcp/src/main/java/org/apache/shardingsphere/infra/datasource/pool/dbcp/metadata/DBCPDataSourcePoolMetaData.java b/infra/data-source-pool/type/dbcp/src/main/java/org/apache/shardingsphere/infra/datasource/pool/dbcp/metadata/DBCPDataSourcePoolMetaData.java deleted file mode 100644 index d0dd5581ce3df..0000000000000 --- a/infra/data-source-pool/type/dbcp/src/main/java/org/apache/shardingsphere/infra/datasource/pool/dbcp/metadata/DBCPDataSourcePoolMetaData.java +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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 org.apache.shardingsphere.infra.datasource.pool.dbcp.metadata; - -import org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolMetaData; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedList; -import java.util.Map; - -/** - * DBCP data source pool meta data. - */ -public final class DBCPDataSourcePoolMetaData implements DataSourcePoolMetaData { - - private static final Collection TRANSIENT_FIELD_NAMES = new LinkedList<>(); - - static { - buildTransientFieldNames(); - } - - private static void buildTransientFieldNames() { - TRANSIENT_FIELD_NAMES.add("closed"); - } - - @Override - public Map getDefaultProperties() { - return Collections.emptyMap(); - } - - @Override - public Map getSkippedProperties() { - return Collections.emptyMap(); - } - - @Override - public Map getPropertySynonyms() { - return Collections.emptyMap(); - } - - @Override - public Collection getTransientFieldNames() { - return TRANSIENT_FIELD_NAMES; - } - - @Override - public DBCPDataSourcePoolFieldMetaData getFieldMetaData() { - return new DBCPDataSourcePoolFieldMetaData(); - } - - @Override - public String getType() { - return "org.apache.commons.dbcp2.BasicDataSource"; - } - - @Override - public Collection getTypeAliases() { - return Arrays.asList("org.apache.commons.dbcp.BasicDataSource", "org.apache.tomcat.dbcp.dbcp2.BasicDataSource"); - } -} diff --git a/infra/data-source-pool/type/dbcp/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolMetaData b/infra/data-source-pool/type/dbcp/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolMetaData deleted file mode 100644 index 289a77e8f95fd..0000000000000 --- a/infra/data-source-pool/type/dbcp/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolMetaData +++ /dev/null @@ -1,18 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one or more -# contributor license agreements. See the NOTICE file distributed with -# this work for additional information regarding copyright ownership. -# The ASF licenses this file to You 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. -# - -org.apache.shardingsphere.infra.datasource.pool.dbcp.metadata.DBCPDataSourcePoolMetaData diff --git a/infra/data-source-pool/type/dbcp/src/test/java/org/apache/shardingsphere/infra/datasource/pool/dbcp/creator/DBCPDataSourcePoolCreatorTest.java b/infra/data-source-pool/type/dbcp/src/test/java/org/apache/shardingsphere/infra/datasource/pool/dbcp/creator/DBCPDataSourcePoolCreatorTest.java deleted file mode 100644 index c6afb6fece67c..0000000000000 --- a/infra/data-source-pool/type/dbcp/src/test/java/org/apache/shardingsphere/infra/datasource/pool/dbcp/creator/DBCPDataSourcePoolCreatorTest.java +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You 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 org.apache.shardingsphere.infra.datasource.pool.dbcp.creator; - -import lombok.SneakyThrows; -import org.apache.commons.dbcp2.BasicDataSource; -import org.apache.shardingsphere.infra.datasource.pool.creator.DataSourcePoolCreator; -import org.apache.shardingsphere.infra.datasource.pool.props.domain.DataSourcePoolProperties; -import org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource; -import org.apache.shardingsphere.test.util.PropertiesBuilder; -import org.apache.shardingsphere.test.util.PropertiesBuilder.Property; -import org.junit.jupiter.api.Test; -import org.mockito.internal.configuration.plugins.Plugins; - -import java.util.HashMap; -import java.util.Map; -import java.util.Properties; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; - -class DBCPDataSourcePoolCreatorTest { - - @Test - void assertCreateDataSource() { - BasicDataSource actual = (BasicDataSource) DataSourcePoolCreator.create(new DataSourcePoolProperties(BasicDataSource.class.getName(), createDataSourcePoolProperties())); - assertThat(actual.getUrl(), is("jdbc:mock://127.0.0.1/foo_ds")); - assertThat(actual.getUsername(), is("root")); - assertThat(actual.getPassword(), is("root")); - assertThat(getConnectionProperties(actual), is(PropertiesBuilder.build(new Property("foo", "foo_value"), new Property("bar", "bar_value")))); - } - - private Map createDataSourcePoolProperties() { - Map result = new HashMap<>(); - result.put("url", "jdbc:mock://127.0.0.1/foo_ds"); - result.put("driverClassName", MockedDataSource.class.getName()); - result.put("username", "root"); - result.put("password", "root"); - result.put("connectionProperties", PropertiesBuilder.build(new Property("foo", "foo_value"), new Property("bar", "bar_value"))); - return result; - } - - @SneakyThrows(ReflectiveOperationException.class) - private Properties getConnectionProperties(final BasicDataSource actual) { - return (Properties) Plugins.getMemberAccessor().get(BasicDataSource.class.getDeclaredField("connectionProperties"), actual); - } -} diff --git a/infra/data-source-pool/type/pom.xml b/infra/data-source-pool/type/pom.xml index 6f5aaac7e94d7..7290ad78269b3 100644 --- a/infra/data-source-pool/type/pom.xml +++ b/infra/data-source-pool/type/pom.xml @@ -28,8 +28,6 @@ ${project.artifactId} - c3p0 - dbcp hikari diff --git a/pom.xml b/pom.xml index 044b4e9099cae..616c5b4dd9a43 100644 --- a/pom.xml +++ b/pom.xml @@ -112,7 +112,6 @@ 4.0.3 2.9.0 - 0.9.5.5 5.9.2 2.2 @@ -537,12 +536,6 @@ ${commons-dbcp2.version} test - - com.mchange - c3p0 - ${c3p0.version} - test - org.junit.jupiter diff --git a/proxy/bootstrap/pom.xml b/proxy/bootstrap/pom.xml index 7eb7e0d1c2584..45f69f7f720d8 100644 --- a/proxy/bootstrap/pom.xml +++ b/proxy/bootstrap/pom.xml @@ -147,11 +147,6 @@ commons-dbcp2 runtime - - com.mchange - c3p0 - runtime - ch.qos.logback