This is an automated email from the ASF dual-hosted git repository.

kimmking 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 5e9a584  use lambda refactor. (#9977)
5e9a584 is described below

commit 5e9a58451c6bbeb4f84f1fffb9a21ef69f242f10
Author: donjuan6 <[email protected]>
AuthorDate: Thu Apr 8 11:24:41 2021 +0800

    use lambda refactor. (#9977)
    
    * use lambda refactor.
    
    * use lambda refactor.
---
 .../shardingsphere/agent/core/plugin/PluginLoader.java     | 14 +++++---------
 .../shardingsphere/agent/core/spi/AgentServiceLoader.java  |  5 ++---
 .../shardingsphere/agent/core/spi/PluginServiceLoader.java |  4 +---
 .../agent/metrics/api/advice/SQLRouteEngineAdvice.java     | 10 ++++------
 .../agent/metrics/api/util/ReflectiveUtil.java             | 12 ++++--------
 .../agent/metrics/prometheus/util/ReflectiveUtil.java      | 12 ++++--------
 .../infra/config/datasource/DataSourceConfiguration.java   | 10 ++++------
 .../transaction/xa/XAShardingTransactionManager.java       | 13 +++++++++----
 .../properties/XADataSourceDefinitionFactory.java          |  5 ++---
 .../swapper/DataSourcePropertyProviderLoader.java          |  4 +---
 .../xa/jta/datasource/swapper/DataSourceSwapper.java       | 10 ++++------
 .../base/seata/at/SeataATShardingTransactionManager.java   |  4 +---
 .../transaction/ShardingTransactionManagerEngine.java      |  4 +---
 13 files changed, 42 insertions(+), 65 deletions(-)

diff --git 
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java
 
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java
index ecfacc9..20bd2e5 100644
--- 
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java
+++ 
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/plugin/PluginLoader.java
@@ -29,8 +29,8 @@ import net.bytebuddy.matcher.ElementMatcher;
 import net.bytebuddy.matcher.ElementMatcher.Junction;
 import org.apache.shardingsphere.agent.api.point.PluginInterceptorPoint;
 import org.apache.shardingsphere.agent.config.AgentConfiguration;
-import 
org.apache.shardingsphere.agent.core.config.registry.AgentConfigurationRegistry;
 import org.apache.shardingsphere.agent.core.config.path.AgentPathBuilder;
+import 
org.apache.shardingsphere.agent.core.config.registry.AgentConfigurationRegistry;
 import org.apache.shardingsphere.agent.core.spi.PluginServiceLoader;
 import 
org.apache.shardingsphere.agent.spi.definition.AbstractPluginDefinitionService;
 import org.apache.shardingsphere.agent.spi.definition.PluginDefinitionService;
@@ -41,7 +41,6 @@ import java.io.File;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
@@ -254,13 +253,10 @@ public final class PluginLoader extends ClassLoader 
implements Closeable {
     }
     
     private void loadPluginDefinitionServices(final Set<String> 
ignoredPluginNames, final Map<String, PluginInterceptorPoint> pointMap) {
-        Collection<PluginDefinitionService> pluginDefinitionServices = 
PluginServiceLoader.newServiceInstances(PluginDefinitionService.class);
-        for (PluginDefinitionService each : pluginDefinitionServices) {
-            if (!ignoredPluginNames.isEmpty() && 
ignoredPluginNames.contains(each.getType())) {
-                continue;
-            }
-            buildPluginInterceptorPointMap(each, pointMap);
-        }
+        PluginServiceLoader.newServiceInstances(PluginDefinitionService.class)
+                .stream()
+                .filter(each -> ignoredPluginNames.isEmpty() || 
!ignoredPluginNames.contains(each.getType()))
+                .forEach(each -> buildPluginInterceptorPointMap(each, 
pointMap));
     }
     
     private String classNameToPath(final String className) {
diff --git 
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/spi/AgentServiceLoader.java
 
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/spi/AgentServiceLoader.java
index 608c65a..6412a20 100644
--- 
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/spi/AgentServiceLoader.java
+++ 
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/spi/AgentServiceLoader.java
@@ -77,8 +77,7 @@ public final class AgentServiceLoader<T> {
             return;
         }
         serviceMap.put(service, new LinkedList<>());
-        for (T each : ServiceLoader.load(service, PluginLoader.getInstance())) 
{
-            serviceMap.get(service).add(each);
-        }
+        ServiceLoader.load(service, PluginLoader.getInstance())
+                .forEach(each -> serviceMap.get(service).add(each));
     }
 }
diff --git 
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/spi/PluginServiceLoader.java
 
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/spi/PluginServiceLoader.java
index 44d3e22..d30d292 100644
--- 
a/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/spi/PluginServiceLoader.java
+++ 
b/shardingsphere-agent/shardingsphere-agent-core/src/main/java/org/apache/shardingsphere/agent/core/spi/PluginServiceLoader.java
@@ -41,9 +41,7 @@ public final class PluginServiceLoader {
      */
     public static <T> Collection<T> newServiceInstances(final Class<T> 
service) {
         List<T> result = new LinkedList<>();
-        for (T each : ServiceLoader.load(service, PluginLoader.getInstance())) 
{
-            result.add(each);
-        }
+        ServiceLoader.load(service, 
PluginLoader.getInstance()).forEach(result::add);
         return result;
     }
 }
diff --git 
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdvice.java
 
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdvice.java
index 5f56c55..69fc34c 100644
--- 
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdvice.java
+++ 
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/main/java/org/apache/shardingsphere/agent/metrics/api/advice/SQLRouteEngineAdvice.java
@@ -79,13 +79,11 @@ public final class SQLRouteEngineAdvice implements 
InstanceMethodAroundAdvice {
         RouteContext routeContext = (RouteContext) result.getResult();
         if (null != routeContext) {
             Collection<RouteUnit> routeUnits = routeContext.getRouteUnits();
-            for (RouteUnit each : routeUnits) {
+            routeUnits.forEach(each -> {
                 RouteMapper dataSourceMapper = each.getDataSourceMapper();
-                MetricsReporter.counterIncrement(ROUTE_DATASOURCE, new 
String[] {dataSourceMapper.getActualName()});
-                for (RouteMapper table : each.getTableMappers()) {
-                    MetricsReporter.counterIncrement(ROUTE_TABLE, new String[] 
{table.getActualName()});
-                }
-            }
+                MetricsReporter.counterIncrement(ROUTE_DATASOURCE, new 
String[]{dataSourceMapper.getActualName()});
+                each.getTableMappers().forEach(table -> 
MetricsReporter.counterIncrement(ROUTE_TABLE, new 
String[]{table.getActualName()}));
+            });
         }
     }
 }
diff --git 
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/util/ReflectiveUtil.java
 
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/util/ReflectiveUtil.java
index 7c34d2b..ac78b9d 100644
--- 
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/util/ReflectiveUtil.java
+++ 
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-api/src/test/java/org/apache/shardingsphere/agent/metrics/api/util/ReflectiveUtil.java
@@ -23,6 +23,7 @@ import lombok.SneakyThrows;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
+import java.util.Arrays;
 
 /**
  * Reflective utility.
@@ -74,13 +75,8 @@ public final class ReflectiveUtil {
 
     private static Field getField(final Class<?> clazz, final String 
fieldName) {
         Field[] fields = clazz.getDeclaredFields();
-        if (fields.length != 0) {
-            for (Field each : fields) {
-                if (fieldName.equals(each.getName())) {
-                    return each;
-                }
-            }
-        }
-        return null;
+        return fields.length != 0
+                ? Arrays.stream(fields).filter(each -> 
fieldName.equals(each.getName())).findFirst().orElse(null)
+                : null;
     }
 }
diff --git 
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/util/ReflectiveUtil.java
 
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/util/ReflectiveUtil.java
index 200a0e1..7d0751d 100644
--- 
a/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/util/ReflectiveUtil.java
+++ 
b/shardingsphere-agent/shardingsphere-agent-plugins/shardingsphere-agent-plugin-metrics/shardingsphere-agent-metrics-prometheus/src/test/java/org/apache/shardingsphere/agent/metrics/prometheus/util/ReflectiveUtil.java
@@ -21,6 +21,7 @@ import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 
 import java.lang.reflect.Field;
+import java.util.Arrays;
 
 /**
  * Reflective utility.
@@ -54,13 +55,8 @@ public final class ReflectiveUtil {
 
     private static Field getField(final Class<?> clazz, final String 
fieldName) {
         Field[] fields = clazz.getDeclaredFields();
-        if (fields.length != 0) {
-            for (Field each : fields) {
-                if (fieldName.equals(each.getName())) {
-                    return each;
-                }
-            }
-        }
-        return null;
+        return fields.length != 0
+                ? Arrays.stream(fields).filter(each -> 
fieldName.equals(each.getName())).findFirst().orElse(null)
+                : null;
     }
 }
diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/DataSourceConfiguration.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/DataSourceConfiguration.java
index 5ed1196..4096973 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/DataSourceConfiguration.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/config/datasource/DataSourceConfiguration.java
@@ -29,6 +29,7 @@ import 
org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
 
 import javax.sql.DataSource;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
@@ -132,12 +133,9 @@ public final class DataSourceConfiguration {
     
     private Optional<Method> findSetterMethod(final Method[] methods, final 
String property) {
         String setterMethodName = Joiner.on("").join(SETTER_PREFIX, 
CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, property));
-        for (Method each : methods) {
-            if (each.getName().equals(setterMethodName) && 1 == 
each.getParameterTypes().length) {
-                return Optional.of(each);
-            }
-        }
-        return Optional.empty();
+        return Arrays.stream(methods)
+                .filter(each -> each.getName().equals(setterMethodName) && 1 
== each.getParameterTypes().length)
+                .findFirst();
     }
     
     /**
diff --git 
a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingTransactionManager.java
 
b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingTransactionManager.java
index d12153d..87bb317 100644
--- 
a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingTransactionManager.java
+++ 
b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/XAShardingTransactionManager.java
@@ -26,6 +26,7 @@ import 
org.apache.shardingsphere.transaction.xa.jta.datasource.XATransactionData
 import 
org.apache.shardingsphere.transaction.xa.manager.XATransactionManagerLoader;
 import org.apache.shardingsphere.transaction.xa.spi.XATransactionManager;
 
+import javax.sql.DataSource;
 import javax.transaction.HeuristicMixedException;
 import javax.transaction.HeuristicRollbackException;
 import javax.transaction.NotSupportedException;
@@ -46,14 +47,18 @@ public final class XAShardingTransactionManager implements 
ShardingTransactionMa
     private final Map<String, XATransactionDataSource> cachedDataSources = new 
HashMap<>();
     
     private XATransactionManager xaTransactionManager;
-    
+
     @Override
     public void init(final DatabaseType databaseType, final 
Collection<ResourceDataSource> resourceDataSources, final String 
transactionMangerType) {
         xaTransactionManager = 
XATransactionManagerLoader.getInstance().getXATransactionManager(transactionMangerType);
         xaTransactionManager.init();
-        for (ResourceDataSource each : resourceDataSources) {
-            cachedDataSources.put(each.getOriginalName(), new 
XATransactionDataSource(databaseType, each.getUniqueResourceName(), 
each.getDataSource(), xaTransactionManager));
-        }
+        resourceDataSources.forEach(each -> 
cachedDataSources.put(each.getOriginalName(), 
newXATransactionDataSource(databaseType, each)));
+    }
+
+    private XATransactionDataSource newXATransactionDataSource(final 
DatabaseType databaseType, final ResourceDataSource resourceDataSource) {
+        String resourceName = resourceDataSource.getUniqueResourceName();
+        DataSource dataSource = resourceDataSource.getDataSource();
+        return new XATransactionDataSource(databaseType, resourceName, 
dataSource, xaTransactionManager);
     }
     
     @Override
diff --git 
a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/properties/XADataSourceDefinitionFactory.java
 
b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/properties/XADataSourceDefinitionFactory.java
index 2be781f..63eb098 100644
--- 
a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/properties/XADataSourceDefinitionFactory.java
+++ 
b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/properties/XADataSourceDefinitionFactory.java
@@ -35,9 +35,8 @@ public final class XADataSourceDefinitionFactory {
     private static final Map<DatabaseType, XADataSourceDefinition> 
XA_DATA_SOURCE_DEFINITIONS = new HashMap<>();
     
     static {
-        for (XADataSourceDefinition each : 
ServiceLoader.load(XADataSourceDefinition.class)) {
-            
XA_DATA_SOURCE_DEFINITIONS.put(DatabaseTypeRegistry.getActualDatabaseType(each.getDatabaseType()),
 each);
-        }
+        ServiceLoader.load(XADataSourceDefinition.class)
+                .forEach(each -> 
XA_DATA_SOURCE_DEFINITIONS.put(DatabaseTypeRegistry.getActualDatabaseType(each.getDatabaseType()),
 each));
     }
     
     /**
diff --git 
a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourcePropertyProviderLoader.java
 
b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourcePropertyProviderLoader.java
index f23a872..3e3c833 100644
--- 
a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourcePropertyProviderLoader.java
+++ 
b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourcePropertyProviderLoader.java
@@ -35,9 +35,7 @@ public final class DataSourcePropertyProviderLoader {
     private static final Map<String, DataSourcePropertyProvider> 
DATA_SOURCE_PROPERTY_PROVIDERS = new HashMap<>();
     
     static {
-        for (DataSourcePropertyProvider each : 
ServiceLoader.load(DataSourcePropertyProvider.class)) {
-            DATA_SOURCE_PROPERTY_PROVIDERS.put(each.getDataSourceClassName(), 
each);
-        }
+        ServiceLoader.load(DataSourcePropertyProvider.class).forEach(each -> 
DATA_SOURCE_PROPERTY_PROVIDERS.put(each.getDataSourceClassName(), each));
     }
     
     /**
diff --git 
a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourceSwapper.java
 
b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourceSwapper.java
index 898ab19..746a274 100644
--- 
a/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourceSwapper.java
+++ 
b/shardingsphere-transaction/shardingsphere-transaction-2pc/shardingsphere-transaction-xa/shardingsphere-transaction-xa-core/src/main/java/org/apache/shardingsphere/transaction/xa/jta/datasource/swapper/DataSourceSwapper.java
@@ -27,6 +27,7 @@ import 
org.apache.shardingsphere.transaction.xa.jta.datasource.properties.XAData
 import javax.sql.DataSource;
 import javax.sql.XADataSource;
 import java.lang.reflect.Method;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -129,11 +130,8 @@ public final class DataSourceSwapper {
     
     private Optional<Method> findSetterMethod(final Method[] methods, final 
String property) {
         String setterMethodName = Joiner.on("").join(SETTER_PREFIX, 
CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, property));
-        for (Method each : methods) {
-            if (each.getName().equals(setterMethodName) && 1 == 
each.getParameterTypes().length) {
-                return Optional.of(each);
-            }
-        }
-        return Optional.empty();
+        return Arrays.stream(methods)
+                .filter(each -> each.getName().equals(setterMethodName) && 1 
== each.getParameterTypes().length)
+                .findFirst();
     }
 }
diff --git 
a/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingTransactionManager.java
 
b/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingTransactionManager.java
index 57b7b28..3f7fb64 100644
--- 
a/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingTransactionManager.java
+++ 
b/shardingsphere-transaction/shardingsphere-transaction-base/shardingsphere-transaction-base-seata-at/src/main/java/org/apache/shardingsphere/transaction/base/seata/at/SeataATShardingTransactionManager.java
@@ -65,9 +65,7 @@ public final class SeataATShardingTransactionManager 
implements ShardingTransact
     public void init(final DatabaseType databaseType, final 
Collection<ResourceDataSource> resourceDataSources, final String 
transactionMangerType) {
         if (enableSeataAT) {
             initSeataRPCClient();
-            for (ResourceDataSource each : resourceDataSources) {
-                dataSourceMap.put(each.getOriginalName(), new 
DataSourceProxy(each.getDataSource()));
-            }
+            resourceDataSources.forEach(each -> 
dataSourceMap.put(each.getOriginalName(), new 
DataSourceProxy(each.getDataSource())));
         }
     }
     
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 985d733..acc2841 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
@@ -64,9 +64,7 @@ public final class ShardingTransactionManagerEngine {
      * @param xaTransactionMangerType XA transaction manger type
      */
     public void init(final DatabaseType databaseType, final Map<String, 
DataSource> dataSourceMap, final String xaTransactionMangerType) {
-        for (Entry<TransactionType, ShardingTransactionManager> entry : 
transactionManagerMap.entrySet()) {
-            entry.getValue().init(databaseType, 
getResourceDataSources(dataSourceMap), xaTransactionMangerType);
-        }
+        transactionManagerMap.forEach((key, value) -> value.init(databaseType, 
getResourceDataSources(dataSourceMap), xaTransactionMangerType));
     }
     
     private Collection<ResourceDataSource> getResourceDataSources(final 
Map<String, DataSource> dataSourceMap) {

Reply via email to