This is an automated email from the ASF dual-hosted git repository.
panjuan 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 2a7cbd4 Refactor DataSourcesMetaData (#7743)
2a7cbd4 is described below
commit 2a7cbd4fc7e2790a7fa205357a74f263470df99c
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Oct 11 17:54:57 2020 +0800
Refactor DataSourcesMetaData (#7743)
---
.../infra/metadata/datasource/DataSourcesMetaData.java | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourcesMetaData.java
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourcesMetaData.java
index 0e9989e..408ab74 100644
---
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourcesMetaData.java
+++
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/metadata/datasource/DataSourcesMetaData.java
@@ -36,13 +36,9 @@ public final class DataSourcesMetaData {
private final Map<String, DataSourceMetaData> dataSourceMetaDataMap;
- public DataSourcesMetaData(final DatabaseType databaseType, final
Map<String, DatabaseAccessConfiguration> databaseAccessConfigMap) {
- dataSourceMetaDataMap = getDataSourceMetaDataMap(databaseType,
databaseAccessConfigMap);
- }
-
- private Map<String, DataSourceMetaData> getDataSourceMetaDataMap(final
DatabaseType databaseType, final Map<String, DatabaseAccessConfiguration>
databaseAccessConfigMap) {
- return databaseAccessConfigMap.entrySet().stream()
- .collect(Collectors.toMap(Entry::getKey, entry ->
databaseType.getDataSourceMetaData(entry.getValue().getUrl(),
entry.getValue().getUsername())));
+ public DataSourcesMetaData(final DatabaseType databaseType, final
Map<String, DatabaseAccessConfiguration> databaseAccessConfigs) {
+ dataSourceMetaDataMap =
databaseAccessConfigs.entrySet().stream().collect(
+ Collectors.toMap(Entry::getKey, entry ->
databaseType.getDataSourceMetaData(entry.getValue().getUrl(),
entry.getValue().getUsername())));
}
/**