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 2020/10/30 08:33:31 UTC
[shardingsphere] branch master updated: use lambda refactor (#7971)
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 f9afaa2 use lambda refactor (#7971)
f9afaa2 is described below
commit f9afaa2ad749977a0a1d9ac30025aba8f6f2bf62
Author: xiaoyu <54...@qq.com>
AuthorDate: Fri Oct 30 16:21:26 2020 +0800
use lambda refactor (#7971)
* use lambda refactor to Map
* fix checkstyle
---
.../infra/parser/sql/SQLStatementParserEngineFactory.java | 2 +-
.../initializer/impl/GovernanceBootstrapInitializer.java | 15 +++++----------
.../transaction/ShardingTransactionManagerEngine.java | 8 ++------
3 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/shardingsphere-infra/shardingsphere-infra-parser/src/main/java/org/apache/shardingsphere/infra/parser/sql/SQLStatementParserEngineFactory.java b/shardingsphere-infra/shardingsphere-infra-parser/src/main/java/org/apache/shardingsphere/infra/parser/sql/SQLStatementParserEngineFactory.java
index ceea8c6..55ce658 100644
--- a/shardingsphere-infra/shardingsphere-infra-parser/src/main/java/org/apache/shardingsphere/infra/parser/sql/SQLStatementParserEngineFactory.java
+++ b/shardingsphere-infra/shardingsphere-infra-parser/src/main/java/org/apache/shardingsphere/infra/parser/sql/SQLStatementParserEngineFactory.java
@@ -38,6 +38,6 @@ public final class SQLStatementParserEngineFactory {
* @return SQL statement parser engine
*/
public static SQLStatementParserEngine getSQLStatementParserEngine(final String databaseType) {
- return ENGINES.containsKey(databaseType) ? ENGINES.get(databaseType) : ENGINES.computeIfAbsent(databaseType, SQLStatementParserEngine::new);
+ return ENGINES.getOrDefault(databaseType, ENGINES.computeIfAbsent(databaseType, SQLStatementParserEngine::new));
}
}
diff --git a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializer.java b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializer.java
index bbf9d99..f066a40 100644
--- a/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializer.java
+++ b/shardingsphere-proxy/shardingsphere-proxy-bootstrap/src/main/java/org/apache/shardingsphere/proxy/initializer/impl/GovernanceBootstrapInitializer.java
@@ -101,19 +101,14 @@ public final class GovernanceBootstrapInitializer extends AbstractBootstrapIniti
}
private Map<String, Map<String, DataSourceParameter>> loadDataSourceParametersMap(final Collection<String> schemaNames) {
- Map<String, Map<String, DataSourceParameter>> result = new LinkedHashMap<>(schemaNames.size(), 1);
- for (String each : schemaNames) {
- result.put(each, DataSourceParameterConverter.getDataSourceParameterMap(governanceFacade.getConfigCenter().loadDataSourceConfigurations(each)));
- }
- return result;
+ return schemaNames.stream()
+ .collect(Collectors.toMap(each -> each, each -> DataSourceParameterConverter.getDataSourceParameterMap(governanceFacade.getConfigCenter().loadDataSourceConfigurations(each)),
+ (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
}
private Map<String, Collection<RuleConfiguration>> loadSchemaRules(final Collection<String> schemaNames) {
- Map<String, Collection<RuleConfiguration>> result = new LinkedHashMap<>(schemaNames.size(), 1);
- for (String each : schemaNames) {
- result.put(each, governanceFacade.getConfigCenter().loadRuleConfigurations(each));
- }
- return result;
+ return schemaNames.stream()
+ .collect(Collectors.toMap(each -> each, each -> governanceFacade.getConfigCenter().loadRuleConfigurations(each), (oldValue, currentValue) -> oldValue, LinkedHashMap::new));
}
@Override
diff --git a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/ShardingTransactionManagerEngine.java b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/ShardingTransactionManagerEngine.java
index 165bb3e..1b42855 100644
--- a/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/ShardingTransactionManagerEngine.java
+++ b/shardingsphere-transaction/shardingsphere-transaction-core/src/main/java/org/apache/shardingsphere/transaction/ShardingTransactionManagerEngine.java
@@ -18,6 +18,7 @@
package org.apache.shardingsphere.transaction;
import com.google.common.base.Preconditions;
+import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.transaction.core.ResourceDataSource;
@@ -28,7 +29,6 @@ import javax.sql.DataSource;
import java.util.Collection;
import java.util.EnumMap;
import java.util.LinkedList;
-import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.ServiceLoader;
@@ -69,11 +69,7 @@ public final class ShardingTransactionManagerEngine {
}
private Collection<ResourceDataSource> getResourceDataSources(final Map<String, DataSource> dataSourceMap) {
- List<ResourceDataSource> result = new LinkedList<>();
- for (Entry<String, DataSource> entry : dataSourceMap.entrySet()) {
- result.add(new ResourceDataSource(entry.getKey(), entry.getValue()));
- }
- return result;
+ return dataSourceMap.entrySet().stream().map(entry -> new ResourceDataSource(entry.getKey(), entry.getValue())).collect(Collectors.toCollection(LinkedList::new));
}
/**