This is an automated email from the ASF dual-hosted git repository.
linghengqian 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 6ec8e4290be Revert #15409 to save driverClassName related properties
(#31653)
6ec8e4290be is described below
commit 6ec8e4290be8db69087b87a5d7e9476a46c84931
Author: Ling Hengqian <[email protected]>
AuthorDate: Wed Jun 12 18:04:29 2024 +0800
Revert #15409 to save driverClassName related properties (#31653)
---
.../infra/datasource/pool/creator/DataSourcePoolReflection.java | 3 ++-
.../infra/datasource/pool/creator/DataSourcePoolCreatorTest.java | 2 ++
.../datasource/pool/props/domain/DataSourcePoolPropertiesTest.java | 1 +
.../pool/hikari/creator/HikariDataSourcePoolCreatorTest.java | 1 +
.../metadata/core/src/test/resources/yaml/persist/data-source-foo.yaml | 1 +
5 files changed, 7 insertions(+), 1 deletion(-)
diff --git
a/infra/data-source-pool/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolReflection.java
b/infra/data-source-pool/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolReflection.java
index acdab74d8b8..ed33ebad11c 100644
---
a/infra/data-source-pool/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolReflection.java
+++
b/infra/data-source-pool/core/src/main/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolReflection.java
@@ -32,6 +32,7 @@ import javax.sql.DataSource;
import java.lang.reflect.Method;
import java.util.Arrays;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
@@ -62,7 +63,7 @@ public final class DataSourcePoolReflection {
static {
GENERAL_CLASS_TYPES = new HashSet<>(
Arrays.asList(boolean.class, Boolean.class, int.class,
Integer.class, long.class, Long.class, String.class, Collection.class,
List.class, Properties.class));
- SKIPPED_PROPERTY_KEYS = new HashSet<>(Arrays.asList("loginTimeout",
"driverClassName"));
+ SKIPPED_PROPERTY_KEYS = new
HashSet<>(Collections.singletonList("loginTimeout"));
}
public DataSourcePoolReflection(final DataSource dataSource) {
diff --git
a/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreatorTest.java
b/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreatorTest.java
index 5c3ea17f30f..57c56229639 100644
---
a/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreatorTest.java
+++
b/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/creator/DataSourcePoolCreatorTest.java
@@ -49,6 +49,7 @@ class DataSourcePoolCreatorTest {
result.put("url", "jdbc:mock://127.0.0.1/foo_ds");
result.put("username", "root");
result.put("password", "root");
+ result.put("driverClassName", MockedDataSource.class.getName());
return result;
}
@@ -58,5 +59,6 @@ class DataSourcePoolCreatorTest {
assertThat(actual.getPassword(), is("root"));
assertThat(actual.getMaxPoolSize(), is(100));
assertNull(actual.getMinPoolSize());
+ assertThat(actual.getDriverClassName(),
is(MockedDataSource.class.getName()));
}
}
diff --git
a/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/props/domain/DataSourcePoolPropertiesTest.java
b/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/props/domain/DataSourcePoolPropertiesTest.java
index c4705905383..079c6e1cf0e 100644
---
a/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/props/domain/DataSourcePoolPropertiesTest.java
+++
b/infra/data-source-pool/core/src/test/java/org/apache/shardingsphere/infra/datasource/pool/props/domain/DataSourcePoolPropertiesTest.java
@@ -50,6 +50,7 @@ class DataSourcePoolPropertiesTest {
actualDataSource.setConnectionInitSqls(Arrays.asList("set names
utf8mb4;", "set names utf8;"));
DataSourcePoolProperties actual =
DataSourcePoolPropertiesCreator.create(actualDataSource);
assertThat(actual.getPoolClassName(),
is(MockedDataSource.class.getName()));
+
assertThat(actual.getAllLocalProperties().get("driverClassName").toString(),
is(MockedDataSource.class.getName()));
assertThat(actual.getAllLocalProperties().get("url").toString(),
is("jdbc:mock://127.0.0.1/foo_ds"));
assertThat(actual.getAllLocalProperties().get("username").toString(),
is("root"));
assertThat(actual.getAllLocalProperties().get("password").toString(),
is("root"));
diff --git
a/infra/data-source-pool/type/hikari/src/test/java/org/apache/shardingsphere/infra/datasource/pool/hikari/creator/HikariDataSourcePoolCreatorTest.java
b/infra/data-source-pool/type/hikari/src/test/java/org/apache/shardingsphere/infra/datasource/pool/hikari/creator/HikariDataSourcePoolCreatorTest.java
index 0567212a511..d166f3ff2b9 100644
---
a/infra/data-source-pool/type/hikari/src/test/java/org/apache/shardingsphere/infra/datasource/pool/hikari/creator/HikariDataSourcePoolCreatorTest.java
+++
b/infra/data-source-pool/type/hikari/src/test/java/org/apache/shardingsphere/infra/datasource/pool/hikari/creator/HikariDataSourcePoolCreatorTest.java
@@ -37,6 +37,7 @@ class HikariDataSourcePoolCreatorTest {
void assertCreateDataSource() {
HikariDataSource actual = (HikariDataSource)
DataSourcePoolCreator.create(new
DataSourcePoolProperties(HikariDataSource.class.getName(),
createDataSourcePoolProperties()));
assertThat(actual.getJdbcUrl(), is("jdbc:mock://127.0.0.1/foo_ds"));
+ assertThat(actual.getDriverClassName(),
is(MockedDataSource.class.getName()));
assertThat(actual.getUsername(), is("root"));
assertThat(actual.getPassword(), is("root"));
assertThat(actual.getDataSourceProperties(),
is(PropertiesBuilder.build(new Property("foo", "foo_value"), new
Property("bar", "bar_value"))));
diff --git
a/kernel/metadata/core/src/test/resources/yaml/persist/data-source-foo.yaml
b/kernel/metadata/core/src/test/resources/yaml/persist/data-source-foo.yaml
index 00107256be7..79fcfa6c8d9 100644
--- a/kernel/metadata/core/src/test/resources/yaml/persist/data-source-foo.yaml
+++ b/kernel/metadata/core/src/test/resources/yaml/persist/data-source-foo.yaml
@@ -18,6 +18,7 @@
foo_ds:
password: root
closed: false
+ driverClassName: com.mysql.cj.jdbc.Driver
dataSourceClassName:
org.apache.shardingsphere.test.fixture.jdbc.MockedDataSource
connectionInitSqls:
# No spaces after conversion
