You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2021/10/01 10:16:25 UTC
[shardingsphere] branch master updated: Remove duplicated code on
YamlShardingSphereDataSourceFactory (#12871)
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 0a97586 Remove duplicated code on YamlShardingSphereDataSourceFactory (#12871)
0a97586 is described below
commit 0a9758611e15dfce4925e8415344008fbef53453
Author: Liang Zhang <te...@163.com>
AuthorDate: Fri Oct 1 18:15:51 2021 +0800
Remove duplicated code on YamlShardingSphereDataSourceFactory (#12871)
---
.../api/yaml/YamlShardingSphereDataSourceFactory.java | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/api/yaml/YamlShardingSphereDataSourceFactory.java b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/api/yaml/YamlShardingSphereDataSourceFactory.java
index 56fa3a4..2d6b922 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/api/yaml/YamlShardingSphereDataSourceFactory.java
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/src/main/java/org/apache/shardingsphere/driver/api/yaml/YamlShardingSphereDataSourceFactory.java
@@ -97,10 +97,7 @@ public final class YamlShardingSphereDataSourceFactory {
* @throws IOException IO exception
*/
public static DataSource createDataSource(final DataSource dataSource, final File yamlFile) throws SQLException, IOException {
- YamlRootConfiguration rootConfig = YamlEngine.unmarshal(yamlFile, YamlRootConfiguration.class);
- Map<String, DataSource> dataSourceMap = new HashMap<>(1, 1);
- dataSourceMap.put(Strings.isNullOrEmpty(rootConfig.getSchemaName()) ? DefaultSchema.LOGIC_NAME : rootConfig.getSchemaName(), dataSource);
- return createDataSource(dataSourceMap, rootConfig);
+ return createDataSource(dataSource, YamlEngine.unmarshal(yamlFile, YamlRootConfiguration.class));
}
/**
@@ -126,10 +123,7 @@ public final class YamlShardingSphereDataSourceFactory {
* @throws IOException IO exception
*/
public static DataSource createDataSource(final DataSource dataSource, final byte[] yamlBytes) throws SQLException, IOException {
- YamlRootConfiguration rootConfig = YamlEngine.unmarshal(yamlBytes, YamlRootConfiguration.class);
- Map<String, DataSource> dataSourceMap = new HashMap<>(1, 1);
- dataSourceMap.put(Strings.isNullOrEmpty(rootConfig.getSchemaName()) ? DefaultSchema.LOGIC_NAME : rootConfig.getSchemaName(), dataSource);
- return createDataSource(dataSourceMap, rootConfig);
+ return createDataSource(dataSource, YamlEngine.unmarshal(yamlBytes, YamlRootConfiguration.class));
}
private static DataSource createDataSource(final Map<String, DataSource> dataSourceMap, final YamlRootConfiguration rootConfig) throws SQLException {
@@ -137,4 +131,10 @@ public final class YamlShardingSphereDataSourceFactory {
Collection<RuleConfiguration> ruleConfigs = SWAPPER_ENGINE.swapToRuleConfigurations(rootConfig.getRules());
return ShardingSphereDataSourceFactory.createDataSource(rootConfig.getSchemaName(), modeConfig, dataSourceMap, ruleConfigs, rootConfig.getProps());
}
+
+ private static DataSource createDataSource(final DataSource dataSource, final YamlRootConfiguration rootConfig) throws SQLException {
+ Map<String, DataSource> dataSourceMap = new HashMap<>(1, 1);
+ dataSourceMap.put(Strings.isNullOrEmpty(rootConfig.getSchemaName()) ? DefaultSchema.LOGIC_NAME : rootConfig.getSchemaName(), dataSource);
+ return createDataSource(dataSourceMap, rootConfig);
+ }
}