This is an automated email from the ASF dual-hosted git repository.
zhaojinchao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new dc1305c Add aliases of DBCPDataSourcePoolMetaData (#15857)
dc1305c is described below
commit dc1305cc7799cfc4bc99ab55a186535b13419f2a
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Mar 7 22:16:11 2022 +0800
Add aliases of DBCPDataSourcePoolMetaData (#15857)
* Add aliases of DBCPDataSourcePoolMetaData
* Add aliases of DBCPDataSourcePoolMetaData
* Update DBCPDataSourcePoolMetaData
---
.../type/dbcp/DBCPDataSourcePoolMetaData.java | 6 ++
.../dbcp/TomcatDBCPDataSourcePoolMetaData.java | 68 ----------------------
...datasource.pool.metadata.DataSourcePoolMetaData | 1 -
3 files changed, 6 insertions(+), 69 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/type/dbcp/DBCPDataSourcePoolMetaData.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/type/dbcp/DBCPDataSourcePoolMetaData.java
index 10cfddf..7ccd0f4 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/type/dbcp/DBCPDataSourcePoolMetaData.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/type/dbcp/DBCPDataSourcePoolMetaData.java
@@ -20,6 +20,7 @@ package
org.apache.shardingsphere.infra.datasource.pool.metadata.type.dbcp;
import lombok.Getter;
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;
@@ -65,4 +66,9 @@ public final class DBCPDataSourcePoolMetaData implements
DataSourcePoolMetaData
public String getType() {
return "org.apache.commons.dbcp2.BasicDataSource";
}
+
+ @Override
+ public Collection<String> getTypeAliases() {
+ return Arrays.asList("org.apache.commons.dbcp.BasicDataSource",
"org.apache.tomcat.dbcp.dbcp2.BasicDataSource");
+ }
}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/type/dbcp/TomcatDBCPDataSourcePoolMetaData.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/type/dbcp/TomcatDBCPDataSourcePoolMetaData.java
deleted file mode 100644
index f2a2990..0000000
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/datasource/pool/metadata/type/dbcp/TomcatDBCPDataSourcePoolMetaData.java
+++ /dev/null
@@ -1,68 +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.metadata.type.dbcp;
-
-import lombok.Getter;
-import
org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolMetaData;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.Map;
-
-/**
- * Tomcat JDBC data source pool meta data.
- */
-@Getter
-public final class TomcatDBCPDataSourcePoolMetaData implements
DataSourcePoolMetaData {
-
- private final Collection<String> transientFieldNames = new LinkedList<>();
-
- public TomcatDBCPDataSourcePoolMetaData() {
- buildTransientFieldNames();
- }
-
- private void buildTransientFieldNames() {
- transientFieldNames.add("closed");
- }
-
- @Override
- public Map<String, Object> getDefaultProperties() {
- return Collections.emptyMap();
- }
-
- @Override
- public Map<String, Object> getInvalidProperties() {
- return Collections.emptyMap();
- }
-
- @Override
- public Map<String, String> getPropertySynonyms() {
- return Collections.emptyMap();
- }
-
- @Override
- public DBCPDataSourcePoolFieldMetaData getFieldMetaData() {
- return new DBCPDataSourcePoolFieldMetaData();
- }
-
- @Override
- public String getType() {
- return "org.apache.tomcat.dbcp.dbcp2.BasicDataSource";
- }
-}
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolMetaData
b/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolMetaData
index dba46c1..01db99e 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolMetaData
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/resources/META-INF/services/org.apache.shardingsphere.infra.datasource.pool.metadata.DataSourcePoolMetaData
@@ -17,4 +17,3 @@
org.apache.shardingsphere.infra.datasource.pool.metadata.type.hikari.HikariDataSourcePoolMetaData
org.apache.shardingsphere.infra.datasource.pool.metadata.type.dbcp.DBCPDataSourcePoolMetaData
-org.apache.shardingsphere.infra.datasource.pool.metadata.type.dbcp.TomcatDBCPDataSourcePoolMetaData
