From d218ad4ab9d14da81c2347c2c74360f3d085d71a Mon Sep 17 00:00:00 2001 From: Serendipity Date: Mon, 10 Aug 2020 21:55:06 +0800 Subject: [PATCH] refactor DatabaseAccessConfiguration (#6768) * remove field named password * fix test cases related to DatabaseAccessConfiguration --- .../type/standard/AbstractSQLRouteTest.java | 6 +++--- .../config/DatabaseAccessConfiguration.java | 3 --- .../metadata/datasource/DataSourceMetasTest.java | 16 ++++++++-------- .../kernel/context/SchemaContextsBuilder.java | 2 +- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java index 249e94a5eb..b8e88f11e7 100644 --- a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java +++ b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-route/src/test/java/org/apache/shardingsphere/sharding/route/engine/type/standard/AbstractSQLRouteTest.java @@ -61,9 +61,9 @@ public abstract class AbstractSQLRouteTest extends AbstractRoutingEngineTest { private DataSourceMetas buildDataSourceMetas() { Map dataSourceInfoMap = new HashMap<>(3, 1); - DatabaseAccessConfiguration mainDatabaseAccessConfig = new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/actual_db", "test", null); - DatabaseAccessConfiguration databaseAccessConfiguration0 = new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/actual_db", "test", null); - DatabaseAccessConfiguration databaseAccessConfiguration1 = new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/actual_db", "test", null); + DatabaseAccessConfiguration mainDatabaseAccessConfig = new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/actual_db", "test"); + DatabaseAccessConfiguration databaseAccessConfiguration0 = new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/actual_db", "test"); + DatabaseAccessConfiguration databaseAccessConfiguration1 = new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/actual_db", "test"); dataSourceInfoMap.put("main", mainDatabaseAccessConfig); dataSourceInfoMap.put("ds_0", databaseAccessConfiguration0); dataSourceInfoMap.put("ds_1", databaseAccessConfiguration1); diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/DatabaseAccessConfiguration.java b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/DatabaseAccessConfiguration.java index 94e7db8466..6d2fd32315 100644 --- a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/DatabaseAccessConfiguration.java +++ b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/DatabaseAccessConfiguration.java @@ -30,7 +30,4 @@ public final class DatabaseAccessConfiguration { private final String url; private final String username; - - // TODO check usage of password, issue: #6703 - private final String password; } diff --git a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourceMetasTest.java b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourceMetasTest.java index 7205771e95..4060682aac 100644 --- a/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourceMetasTest.java +++ b/shardingsphere-infra/shardingsphere-infra-common/src/test/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourceMetasTest.java @@ -36,8 +36,8 @@ public final class DataSourceMetasTest { @Test public void assertGetAllInstanceDataSourceNamesForShardingRuleByDifferentDataSource() { Map databaseAccessConfigurationMap = new HashMap<>(2, 1); - databaseAccessConfigurationMap.put("ds_0", new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_0", "test", null)); - databaseAccessConfigurationMap.put("ds_1", new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3307/db_1", "test", null)); + databaseAccessConfigurationMap.put("ds_0", new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_0", "test")); + databaseAccessConfigurationMap.put("ds_1", new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3307/db_1", "test")); DataSourceMetas dataSourceMetas = new DataSourceMetas(DatabaseTypes.getActualDatabaseType("MySQL"), databaseAccessConfigurationMap); Collection allInstanceDataSourceNames = dataSourceMetas.getAllInstanceDataSourceNames(); assertNotNull(allInstanceDataSourceNames); @@ -48,8 +48,8 @@ public final class DataSourceMetasTest { @Test public void assertGetAllInstanceDataSourceNamesForShardingRuleBySameDataSource() { Map databaseAccessConfigurationMap = new HashMap<>(2, 1); - databaseAccessConfigurationMap.put("ds_0", new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_0", "test", null)); - databaseAccessConfigurationMap.put("ds_1", new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_1", "test", null)); + databaseAccessConfigurationMap.put("ds_0", new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_0", "test")); + databaseAccessConfigurationMap.put("ds_1", new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_1", "test")); DataSourceMetas dataSourceMetas = new DataSourceMetas(DatabaseTypes.getActualDatabaseType("MySQL"), databaseAccessConfigurationMap); Collection allInstanceDataSourceNames = dataSourceMetas.getAllInstanceDataSourceNames(); assertNotNull(allInstanceDataSourceNames); @@ -60,8 +60,8 @@ public final class DataSourceMetasTest { @Test public void assertGetActualCatalogForShardingRule() { Map databaseAccessConfigurationMap = new HashMap<>(2, 1); - databaseAccessConfigurationMap.put("ds_0", new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_0", "test", null)); - databaseAccessConfigurationMap.put("ds_1", new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_1", "test", null)); + databaseAccessConfigurationMap.put("ds_0", new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_0", "test")); + databaseAccessConfigurationMap.put("ds_1", new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_1", "test")); DataSourceMetas dataSourceMetas = new DataSourceMetas(DatabaseTypes.getActualDatabaseType("MySQL"), databaseAccessConfigurationMap); assertThat(dataSourceMetas.getDataSourceMetaData("ds_0").getCatalog(), is("db_0")); } @@ -69,8 +69,8 @@ public final class DataSourceMetasTest { @Test public void assertGetActualSchemaNameForShardingRuleForMysql() { Map databaseAccessConfigurationMap = new HashMap<>(2, 1); - databaseAccessConfigurationMap.put("ds_0", new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_0", "test", null)); - databaseAccessConfigurationMap.put("ds_1", new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_1", "test", null)); + databaseAccessConfigurationMap.put("ds_0", new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_0", "test")); + databaseAccessConfigurationMap.put("ds_1", new DatabaseAccessConfiguration("jdbc:mysql://127.0.0.1:3306/db_1", "test")); DataSourceMetas dataSourceMetas = new DataSourceMetas(DatabaseTypes.getActualDatabaseType("MySQL"), databaseAccessConfigurationMap); assertNull(dataSourceMetas.getDataSourceMetaData("ds_0").getSchema()); } diff --git a/shardingsphere-kernel/shardingsphere-kernel-context/src/main/java/org/apache/shardingsphere/kernel/context/SchemaContextsBuilder.java b/shardingsphere-kernel/shardingsphere-kernel-context/src/main/java/org/apache/shardingsphere/kernel/context/SchemaContextsBuilder.java index 6b74eda04c..aea48ef43c 100644 --- a/shardingsphere-kernel/shardingsphere-kernel-context/src/main/java/org/apache/shardingsphere/kernel/context/SchemaContextsBuilder.java +++ b/shardingsphere-kernel/shardingsphere-kernel-context/src/main/java/org/apache/shardingsphere/kernel/context/SchemaContextsBuilder.java @@ -139,7 +139,7 @@ public final class SchemaContextsBuilder { DataSource dataSource = entry.getValue(); try (Connection connection = dataSource.getConnection()) { DatabaseMetaData metaData = connection.getMetaData(); - result.put(entry.getKey(), new DatabaseAccessConfiguration(metaData.getURL(), metaData.getUserName(), null)); + result.put(entry.getKey(), new DatabaseAccessConfiguration(metaData.getURL(), metaData.getUserName())); } } return result; -- GitLab