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

menghaoran 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 1c3fb76  Remove unnecessary usage of common-collection4 (#16037)
1c3fb76 is described below

commit 1c3fb7658670f70850052248869a5f1f0539c53c
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Mar 13 22:48:52 2022 +0800

    Remove unnecessary usage of common-collection4 (#16037)
    
    * Remove unnecessary usage of common-collection4
    
    * Remove unnecessary usage of common-collection4
---
 .../shardingsphere-distsql-parser/pom.xml          |  5 -----
 .../range/BoundaryBasedRangeShardingAlgorithm.java |  4 +---
 .../shardingsphere/sharding/rule/ShardingRule.java | 22 ++++++++-------------
 .../infra/instance/InstanceContext.java            |  3 +--
 .../yaml/schema/swapper/SchemaYamlSwapper.java     |  6 ++----
 .../sql/execute/engine/raw/RawExecutor.java        |  3 +--
 .../executor/original/FilterableSchema.java        |  4 ++--
 .../metadata/calcite/FederationSchema.java         |  4 ++--
 .../shardingsphere-jdbc-core/pom.xml               |  5 +++++
 .../pipeline/core/importer/AbstractImporter.java   | 23 ++++++++--------------
 .../pipeline/core/importer/DataRecordMerger.java   |  5 +----
 .../mysql/ingest/MySQLIncrementalDumperTest.java   | 14 ++++++-------
 .../api/ingest/record/GroupedDataRecord.java       |  2 +-
 .../shardingsphere-sql-parser-engine/pom.xml       |  5 -----
 .../scaling/query/CheckScalingStatementAssert.java |  5 ++---
 .../update/ApplyScalingStatementAssert.java        |  3 +--
 .../scaling/update/DropScalingStatementAssert.java |  5 ++---
 .../update/ResetScalingStatementAssert.java        |  5 ++---
 ...RestoreScalingSourceWritingStatementAssert.java |  3 +--
 .../update/StartScalingStatementAssert.java        |  4 ++--
 .../StopScalingSourceWritingStatementAssert.java   |  3 +--
 .../scaling/update/StopScalingStatementAssert.java |  7 +++----
 .../ral/scaling/CheckScalingStatementTestCase.java |  2 --
 23 files changed, 53 insertions(+), 89 deletions(-)

diff --git a/shardingsphere-distsql/shardingsphere-distsql-parser/pom.xml 
b/shardingsphere-distsql/shardingsphere-distsql-parser/pom.xml
index fb2a68b..9669394 100644
--- a/shardingsphere-distsql/shardingsphere-distsql-parser/pom.xml
+++ b/shardingsphere-distsql/shardingsphere-distsql-parser/pom.xml
@@ -40,11 +40,6 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-        </dependency>
-        
-        <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
         </dependency>
diff --git 
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/BoundaryBasedRangeShardingAlgorithm.java
 
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/BoundaryBasedRangeShardingAlgorithm.java
index 330dc6c..98a0bb0 100644
--- 
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/BoundaryBasedRangeShardingAlgorithm.java
+++ 
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/algorithm/sharding/range/BoundaryBasedRangeShardingAlgorithm.java
@@ -21,7 +21,6 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Range;
 import com.google.common.primitives.Longs;
-import org.apache.commons.collections4.CollectionUtils;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -39,13 +38,12 @@ public final class BoundaryBasedRangeShardingAlgorithm 
extends AbstractRangeShar
     
     private static final String SHARDING_RANGES_KEY = "sharding-ranges";
     
-    @SuppressWarnings("UnstableApiUsage")
     @Override
     public Map<Integer, Range<Comparable<?>>> calculatePartitionRange(final 
Properties props) {
         Preconditions.checkState(props.containsKey(SHARDING_RANGES_KEY), 
"Sharding ranges cannot be null.");
         List<Long> partitionRanges = 
Splitter.on(",").trimResults().splitToList(props.getProperty(SHARDING_RANGES_KEY))
                 
.stream().map(Longs::tryParse).filter(Objects::nonNull).sorted().collect(Collectors.toList());
-        
Preconditions.checkArgument(CollectionUtils.isNotEmpty(partitionRanges), 
"Sharding ranges is not valid.");
+        Preconditions.checkArgument(!partitionRanges.isEmpty(), "Sharding 
ranges is not valid.");
         Map<Integer, Range<Comparable<?>>> result = new 
HashMap<>(partitionRanges.size() + 1, 1);
         for (int i = 0; i < partitionRanges.size(); i++) {
             Long rangeValue = partitionRanges.get(i);
diff --git 
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
 
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
index 535115d..c221471 100644
--- 
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
+++ 
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/rule/ShardingRule.java
@@ -20,7 +20,6 @@ package org.apache.shardingsphere.sharding.rule;
 import com.google.common.base.Preconditions;
 import com.google.common.base.Splitter;
 import lombok.Getter;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shardingsphere.infra.binder.statement.SQLStatementContext;
 import 
org.apache.shardingsphere.infra.binder.statement.dml.SelectStatementContext;
@@ -245,7 +244,7 @@ public final class ShardingRule implements SchemaRule, 
DataNodeContainedRule, Ta
                     .filter(optional -> 
!optional.isEmpty()).collect(Collectors.toList());
             Collection<String> actualTableNames = 
tableRule.getActualTableNames(each).stream().map(optional -> 
substring(optional)[1])
                     .filter(optional -> 
!optional.isEmpty()).collect(Collectors.toList());
-            if (!CollectionUtils.isEqualCollection(sampleActualTableNames, 
actualTableNames)) {
+            if (!sampleActualTableNames.equals(actualTableNames)) {
                 throw new ShardingSphereConfigurationException("The %s on 
bindingTableGroup `%s` are inconsistent", "actualTableNames", 
bindingTableGroup);
             }
             checkSameAlgorithmOnTable(sampleTableRule, 
sampleTableRule.getActualTableNames(each).stream().findFirst().get(), tableRule,
@@ -253,8 +252,7 @@ public final class ShardingRule implements SchemaRule, 
DataNodeContainedRule, Ta
         }
     }
     
-    private void checkSameAlgorithmOnDatabase(final TableRule sampleTableRule, 
final TableRule tableRule, final String dataSourceName,
-                                              final String bindingTableGroup) {
+    private void checkSameAlgorithmOnDatabase(final TableRule sampleTableRule, 
final TableRule tableRule, final String dataSourceName, final String 
bindingTableGroup) {
         List<String[]> algorithmExpressions = new LinkedList<>();
         String logicName = substring(dataSourceName)[0];
         algorithmExpressions.add(new String[] 
{getAlgorithmExpression(sampleTableRule, true), logicName, 
getShardingColumn(sampleTableRule.getDatabaseShardingStrategyConfig())});
@@ -263,13 +261,10 @@ public final class ShardingRule implements SchemaRule, 
DataNodeContainedRule, Ta
     }
     
     private String getAlgorithmExpression(final TableRule tableRule, final 
boolean databaseOrTable) {
-        ShardingStrategyConfiguration shardingStrategyConfiguration = null;
-        if (databaseOrTable) {
-            shardingStrategyConfiguration = null == 
tableRule.getDatabaseShardingStrategyConfig() ? 
defaultDatabaseShardingStrategyConfig : 
tableRule.getDatabaseShardingStrategyConfig();
-        } else {
-            shardingStrategyConfiguration = null == 
tableRule.getTableShardingStrategyConfig() ? defaultTableShardingStrategyConfig 
: tableRule.getTableShardingStrategyConfig();
-        }
-        ShardingAlgorithm shardingAlgorithm = 
shardingAlgorithms.get(shardingStrategyConfiguration.getShardingAlgorithmName());
+        ShardingStrategyConfiguration shardingStrategyConfig = databaseOrTable
+                ? null == tableRule.getDatabaseShardingStrategyConfig() ? 
defaultDatabaseShardingStrategyConfig : 
tableRule.getDatabaseShardingStrategyConfig()
+                : null == tableRule.getTableShardingStrategyConfig() ? 
defaultTableShardingStrategyConfig : tableRule.getTableShardingStrategyConfig();
+        ShardingAlgorithm shardingAlgorithm = 
shardingAlgorithms.get(shardingStrategyConfig.getShardingAlgorithmName());
         return null == shardingAlgorithm ? "" : 
StringUtils.defaultString(shardingAlgorithm.getProps().getProperty("algorithm-expression"),
 "");
     }
     
@@ -287,8 +282,7 @@ public final class ShardingRule implements SchemaRule, 
DataNodeContainedRule, Ta
         return StringUtils.defaultString(result, "");
     }
     
-    private void checkSameAlgorithmOnTable(final TableRule sampleTableRule, 
final String sampleTableName, final TableRule tableRule,
-                                           final String tableName, final 
String bindingTableGroup) {
+    private void checkSameAlgorithmOnTable(final TableRule sampleTableRule, 
final String sampleTableName, final TableRule tableRule, final String 
tableName, final String bindingTableGroup) {
         List<String[]> algorithmExpressions = new LinkedList<>();
         algorithmExpressions.add(new String[] 
{getAlgorithmExpression(sampleTableRule, false), substring(sampleTableName)[0],
                 
getShardingColumn(sampleTableRule.getTableShardingStrategyConfig())});
@@ -311,7 +305,7 @@ public final class ShardingRule implements SchemaRule, 
DataNodeContainedRule, Ta
     
     private String[] substring(final String str) {
         int charAt = str.lastIndexOf("_") + 1;
-        String index = str.substring(charAt, str.length());
+        String index = str.substring(charAt);
         return StringUtils.isNumeric(index) ? new String[] {str.replace(index, 
""), index} : new String[] {str, ""};
     }
     
diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/instance/InstanceContext.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/instance/InstanceContext.java
index b191a7a..d61d0a0 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/instance/InstanceContext.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/instance/InstanceContext.java
@@ -18,7 +18,6 @@
 package org.apache.shardingsphere.infra.instance;
 
 import lombok.Getter;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.shardingsphere.infra.config.mode.ModeConfiguration;
 import org.apache.shardingsphere.infra.instance.definition.InstanceId;
 import org.apache.shardingsphere.infra.instance.definition.InstanceType;
@@ -152,7 +151,7 @@ public final class InstanceContext {
     public List<InstanceId> getComputeNodeInstanceIds(final InstanceType 
instanceType, final Collection<String> labels) {
         List<InstanceId> result = new ArrayList<>(computeNodeInstances.size());
         for (ComputeNodeInstance each : computeNodeInstances) {
-            if (each.getInstanceDefinition().getInstanceType() == instanceType 
&& CollectionUtils.containsAny(labels, each.getLabels())) {
+            if (each.getInstanceDefinition().getInstanceType() == instanceType 
&& labels.stream().anyMatch(((Collection<String>) each.getLabels())::contains)) 
{
                 result.add(each.getInstanceDefinition().getInstanceId());
             }
         }
diff --git 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/schema/swapper/SchemaYamlSwapper.java
 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/schema/swapper/SchemaYamlSwapper.java
index 34e6812..893f9dc 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/schema/swapper/SchemaYamlSwapper.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-common/src/main/java/org/apache/shardingsphere/infra/yaml/schema/swapper/SchemaYamlSwapper.java
@@ -17,8 +17,6 @@
 
 package org.apache.shardingsphere.infra.yaml.schema.swapper;
 
-import com.google.common.collect.Maps;
-import org.apache.commons.collections4.MapUtils;
 import org.apache.shardingsphere.infra.metadata.schema.ShardingSphereSchema;
 import org.apache.shardingsphere.infra.metadata.schema.model.TableMetaData;
 import 
org.apache.shardingsphere.infra.yaml.config.swapper.YamlConfigurationSwapper;
@@ -52,8 +50,8 @@ public final class SchemaYamlSwapper implements 
YamlConfigurationSwapper<YamlSch
     }
     
     private ShardingSphereSchema swapSchema(final YamlSchema schema) {
-        return new ShardingSphereSchema(MapUtils.isEmpty(schema.getTables()) ? 
Maps.newLinkedHashMap() : schema.getTables().entrySet().stream()
-                .collect(Collectors.toMap(Entry::getKey, entry -> 
swapTable(entry.getValue()), (oldValue, currentValue) -> oldValue, 
LinkedHashMap::new)));
+        return new ShardingSphereSchema(null == schema.getTables() || 
schema.getTables().isEmpty() ? new LinkedHashMap<>()
+                : 
schema.getTables().entrySet().stream().collect(Collectors.toMap(Entry::getKey, 
entry -> swapTable(entry.getValue()), (oldValue, currentValue) -> oldValue, 
LinkedHashMap::new)));
     }
     
     private TableMetaData swapTable(final YamlTableMetaData table) {
diff --git 
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
 
b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
index cd46fe2..3a54847 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-executor/src/main/java/org/apache/shardingsphere/infra/executor/sql/execute/engine/raw/RawExecutor.java
@@ -18,7 +18,6 @@
 package org.apache.shardingsphere.infra.executor.sql.execute.engine.raw;
 
 import lombok.RequiredArgsConstructor;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.shardingsphere.infra.binder.LogicSQL;
 import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
 import org.apache.shardingsphere.infra.executor.kernel.ExecutorEngine;
@@ -61,7 +60,7 @@ public final class RawExecutor {
             // TODO Load query header for first query
             List<ExecuteResult> results = execute(executionGroupContext, 
(RawSQLExecutorCallback) null, callback);
             
ExecuteProcessEngine.finish(executionGroupContext.getExecutionID());
-            return CollectionUtils.isEmpty(results) || 
Objects.isNull(results.get(0)) ? Collections
+            return results.isEmpty() || Objects.isNull(results.get(0)) ? 
Collections
                 .singletonList(new UpdateResult(0, 0L)) : results;
         } finally {
             ExecuteProcessEngine.clean();
diff --git 
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/FilterableSchema.java
 
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/FilterableSchema.java
index 18cfc6b..80a3c54 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/FilterableSchema.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-executor/src/main/java/org/apache/shardingsphere/infra/federation/executor/original/FilterableSchema.java
@@ -20,12 +20,12 @@ package 
org.apache.shardingsphere.infra.federation.executor.original;
 import lombok.Getter;
 import org.apache.calcite.schema.Table;
 import org.apache.calcite.schema.impl.AbstractSchema;
-import org.apache.commons.collections4.map.LinkedMap;
 import 
org.apache.shardingsphere.infra.federation.executor.original.table.FilterableTable;
 import 
org.apache.shardingsphere.infra.federation.executor.original.table.FilterableTableScanExecutor;
 import 
org.apache.shardingsphere.infra.federation.optimizer.metadata.FederationSchemaMetaData;
 import 
org.apache.shardingsphere.infra.federation.optimizer.metadata.FederationTableMetaData;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
@@ -44,7 +44,7 @@ public final class FilterableSchema extends AbstractSchema {
     }
     
     private Map<String, Table> createTableMap(final FederationSchemaMetaData 
schemaMetaData, final FilterableTableScanExecutor executor) {
-        Map<String, Table> result = new 
LinkedMap<>(schemaMetaData.getTables().size(), 1);
+        Map<String, Table> result = new 
LinkedHashMap<>(schemaMetaData.getTables().size(), 1);
         for (FederationTableMetaData each : 
schemaMetaData.getTables().values()) {
             result.put(each.getName(), new FilterableTable(each, executor, new 
FederationTableStatistic()));
         }
diff --git 
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/calcite/FederationSchema.java
 
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/calcite/FederationSchema.java
index ce3c469..4ce17fd 100644
--- 
a/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/calcite/FederationSchema.java
+++ 
b/shardingsphere-infra/shardingsphere-infra-federation/shardingsphere-infra-federation-optimizer/src/main/java/org/apache/shardingsphere/infra/federation/optimizer/metadata/calcite/FederationSchema.java
@@ -20,10 +20,10 @@ package 
org.apache.shardingsphere.infra.federation.optimizer.metadata.calcite;
 import lombok.Getter;
 import org.apache.calcite.schema.Table;
 import org.apache.calcite.schema.impl.AbstractSchema;
-import org.apache.commons.collections4.map.LinkedMap;
 import 
org.apache.shardingsphere.infra.federation.optimizer.metadata.FederationSchemaMetaData;
 import 
org.apache.shardingsphere.infra.federation.optimizer.metadata.FederationTableMetaData;
 
+import java.util.LinkedHashMap;
 import java.util.Map;
 
 /**
@@ -39,7 +39,7 @@ public final class FederationSchema extends AbstractSchema {
     }
     
     private Map<String, Table> getTableMap(final FederationSchemaMetaData 
metaData) {
-        Map<String, Table> result = new 
LinkedMap<>(metaData.getTables().size(), 1);
+        Map<String, Table> result = new 
LinkedHashMap<>(metaData.getTables().size(), 1);
         for (FederationTableMetaData each : metaData.getTables().values()) {
             result.put(each.getName(), new FederationTable(each));
         }
diff --git a/shardingsphere-jdbc/shardingsphere-jdbc-core/pom.xml 
b/shardingsphere-jdbc/shardingsphere-jdbc-core/pom.xml
index 9160ed0..f1fc853 100644
--- a/shardingsphere-jdbc/shardingsphere-jdbc-core/pom.xml
+++ b/shardingsphere-jdbc/shardingsphere-jdbc-core/pom.xml
@@ -146,6 +146,11 @@
         </dependency>
         
         <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+        </dependency>
+        
+        <dependency>
             <groupId>com.zaxxer</groupId>
             <artifactId>HikariCP</artifactId>
             <scope>compile</scope>
diff --git 
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/AbstractImporter.java
 
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/AbstractImporter.java
index a33e440..a5e5f12 100644
--- 
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/AbstractImporter.java
+++ 
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/AbstractImporter.java
@@ -18,7 +18,6 @@
 package org.apache.shardingsphere.data.pipeline.core.importer;
 
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import 
org.apache.shardingsphere.data.pipeline.api.config.rulealtered.ImporterConfiguration;
 import 
org.apache.shardingsphere.data.pipeline.api.executor.AbstractLifecycleExecutor;
 import 
org.apache.shardingsphere.data.pipeline.api.ingest.channel.PipelineChannel;
@@ -109,24 +108,18 @@ public abstract class AbstractImporter extends 
AbstractLifecycleExecutor impleme
     }
     
     private void flush(final DataSource dataSource, final List<Record> buffer) 
{
-        List<GroupedDataRecord> groupedDataRecords = 
MERGER.group(buffer.stream()
-                .filter(each -> each instanceof DataRecord)
-                .map(each -> (DataRecord) each)
-                .collect(Collectors.toList()));
+        List<GroupedDataRecord> groupedDataRecords = 
MERGER.group(buffer.stream().filter(each -> each instanceof 
DataRecord).map(each -> (DataRecord) each).collect(Collectors.toList()));
         groupedDataRecords.forEach(each -> {
-            if (CollectionUtils.isNotEmpty(each.getDeleteDataRecords())) {
-                flushInternal(dataSource, each.getDeleteDataRecords());
-            }
-            if (CollectionUtils.isNotEmpty(each.getInsertDataRecords())) {
-                flushInternal(dataSource, each.getInsertDataRecords());
-            }
-            if (CollectionUtils.isNotEmpty(each.getUpdateDataRecords())) {
-                flushInternal(dataSource, each.getUpdateDataRecords());
-            }
+            flushInternal(dataSource, each.getDeleteDataRecords());
+            flushInternal(dataSource, each.getInsertDataRecords());
+            flushInternal(dataSource, each.getUpdateDataRecords());
         });
     }
     
     private void flushInternal(final DataSource dataSource, final 
List<DataRecord> buffer) {
+        if (null == buffer || buffer.isEmpty()) {
+            return;
+        }
         boolean success = tryFlush(dataSource, buffer);
         if (isRunning() && !success) {
             throw new PipelineJobExecutionException("write failed.");
@@ -140,7 +133,7 @@ public abstract class AbstractImporter extends 
AbstractLifecycleExecutor impleme
                 return true;
             } catch (final SQLException ex) {
                 log.error("flush failed {}/{} times.", i, 
importerConfig.getRetryTimes(), ex);
-                ThreadUtil.sleep(Math.min(5 * 60 * 1000L, 1000 << i));
+                ThreadUtil.sleep(Math.min(5 * 60 * 1000L, 1000L << i));
             }
         }
         return false;
diff --git 
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMerger.java
 
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMerger.java
index 9bb5cdb..de14de2 100644
--- 
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMerger.java
+++ 
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/core/importer/DataRecordMerger.java
@@ -79,10 +79,7 @@ public final class DataRecordMerger {
         Map<String, List<DataRecord>> tableGroup = 
mergedDataRecords.stream().collect(Collectors.groupingBy(DataRecord::getTableName));
         for (Entry<String, List<DataRecord>> each : tableGroup.entrySet()) {
             Map<String, List<DataRecord>> typeGroup = 
each.getValue().stream().collect(Collectors.groupingBy(DataRecord::getType));
-            result.add(new GroupedDataRecord(each.getKey(),
-                    typeGroup.get(IngestDataChangeType.INSERT),
-                    typeGroup.get(IngestDataChangeType.UPDATE),
-                    typeGroup.get(IngestDataChangeType.DELETE)));
+            result.add(new GroupedDataRecord(each.getKey(), 
typeGroup.get(IngestDataChangeType.INSERT), 
typeGroup.get(IngestDataChangeType.UPDATE), 
typeGroup.get(IngestDataChangeType.DELETE)));
         }
         return result;
     }
diff --git 
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
 
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
index 173ee39..017bac0 100644
--- 
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
+++ 
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-dialect/shardingsphere-data-pipeline-mysql/src/test/java/org/apache/shardingsphere/data/pipeline/mysql/ingest/MySQLIncrementalDumperTest.java
@@ -18,7 +18,6 @@
 package org.apache.shardingsphere.data.pipeline.mysql.ingest;
 
 import lombok.SneakyThrows;
-import org.apache.commons.collections4.map.HashedMap;
 import 
org.apache.shardingsphere.data.pipeline.api.config.ingest.DumperConfiguration;
 import 
org.apache.shardingsphere.data.pipeline.api.datasource.config.impl.StandardPipelineDataSourceConfiguration;
 import org.apache.shardingsphere.data.pipeline.api.ingest.record.DataRecord;
@@ -45,6 +44,7 @@ import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -69,15 +69,10 @@ public final class MySQLIncrementalDumperTest {
         incrementalDumper = new MySQLIncrementalDumper(dumperConfig, new 
BinlogPosition("binlog-000001", 4L), channel, metaDataLoader);
     }
     
-    @After
-    public void tearDown() {
-        dataSourceManager.close();
-    }
-    
     private DumperConfiguration mockDumperConfiguration() {
         DumperConfiguration result = new DumperConfiguration();
         result.setDataSourceConfig(new 
StandardPipelineDataSourceConfiguration("jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL",
 "root", "root"));
-        Map<String, String> tableNameMap = new HashedMap<>(1);
+        Map<String, String> tableNameMap = new HashMap<>(1, 1);
         tableNameMap.put("t_order", "t_order");
         result.setTableNameMap(tableNameMap);
         return result;
@@ -94,6 +89,11 @@ public final class MySQLIncrementalDumperTest {
         }
     }
     
+    @After
+    public void tearDown() {
+        dataSourceManager.close();
+    }
+    
     @Test
     public void assertWriteRowsEvent() {
         WriteRowsEvent rowsEvent = new WriteRowsEvent();
diff --git 
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/GroupedDataRecord.java
 
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/GroupedDataRecord.java
index dac44e3..d0ae80a 100644
--- 
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/GroupedDataRecord.java
+++ 
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-spi/src/main/java/org/apache/shardingsphere/data/pipeline/api/ingest/record/GroupedDataRecord.java
@@ -23,8 +23,8 @@ import lombok.ToString;
 
 import java.util.List;
 
-@Getter
 @RequiredArgsConstructor
+@Getter
 @ToString
 public final class GroupedDataRecord {
     
diff --git a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/pom.xml 
b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/pom.xml
index 7454c35..e93d57d 100644
--- a/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/pom.xml
+++ b/shardingsphere-sql-parser/shardingsphere-sql-parser-engine/pom.xml
@@ -39,11 +39,6 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-collections4</artifactId>
-        </dependency>
-        
-        <dependency>
             <groupId>org.antlr</groupId>
             <artifactId>antlr4-runtime</artifactId>
         </dependency>
diff --git 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/query/CheckScalingStatementAssert.java
 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/query/CheckScalingStatementAssert.java
index e88040c..e24bf8f 100644
--- 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/query/CheckScalingStatementAssert.java
+++ 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/query/CheckScalingStatementAssert.java
@@ -17,7 +17,6 @@
 
 package 
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.scaling.query;
 
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.shardingsphere.distsql.parser.segment.AlgorithmSegment;
 import 
org.apache.shardingsphere.scaling.distsql.statement.CheckScalingStatement;
 import 
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
@@ -54,7 +53,7 @@ public final class CheckScalingStatementAssert {
     }
     
     private static void assertJobIds(final SQLCaseAssertContext assertContext, 
final String actual, final List<String> expected) {
-        if (CollectionUtils.isEmpty(expected)) {
+        if (expected.isEmpty()) {
             assertNull(assertContext.getText("Actual job id should not 
exist."), actual);
         } else {
             assertNotNull(assertContext.getText("Actual job id should 
exist."), actual);
@@ -63,7 +62,7 @@ public final class CheckScalingStatementAssert {
     }
     
     private static void assertTypeStrategy(final SQLCaseAssertContext 
assertContext, final AlgorithmSegment actual, final List<ExpectedAlgorithm> 
expected) {
-        if (CollectionUtils.isEmpty(expected)) {
+        if (expected.isEmpty()) {
             assertNull(assertContext.getText("Actual type strategy should not 
exist."), actual);
         } else {
             assertNotNull(assertContext.getText("Actual type strategy should 
exist."), actual);
diff --git 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/ApplyScalingStatementAssert.java
 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/ApplyScalingStatementAssert.java
index 3887316..d1cd57e 100644
--- 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/ApplyScalingStatementAssert.java
+++ 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/ApplyScalingStatementAssert.java
@@ -17,7 +17,6 @@
 
 package 
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.scaling.update;
 
-import org.apache.commons.collections4.CollectionUtils;
 import 
org.apache.shardingsphere.scaling.distsql.statement.ApplyScalingStatement;
 import 
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
 import 
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.scaling.ApplyScalingStatementTestCase;
@@ -51,7 +50,7 @@ public final class ApplyScalingStatementAssert {
     }
     
     private static void assertJobIds(final SQLCaseAssertContext assertContext, 
final String actual, final List<String> expected) {
-        if (CollectionUtils.isEmpty(expected)) {
+        if (expected.isEmpty()) {
             assertNull(assertContext.getText("Actual job id should not 
exist."), actual);
         } else {
             assertNotNull(assertContext.getText("Actual job id should 
exist."), actual);
diff --git 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/DropScalingStatementAssert.java
 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/DropScalingStatementAssert.java
index b521de7..faeea20 100644
--- 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/DropScalingStatementAssert.java
+++ 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/DropScalingStatementAssert.java
@@ -17,7 +17,6 @@
 
 package 
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.scaling.update;
 
-import org.apache.commons.collections4.CollectionUtils;
 import 
org.apache.shardingsphere.scaling.distsql.statement.DropScalingStatement;
 import 
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
 import 
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.scaling.DropScalingStatementTestCase;
@@ -25,8 +24,8 @@ import 
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
 
 /**
@@ -51,7 +50,7 @@ public final class DropScalingStatementAssert {
     }
     
     private static void assertJobIds(final SQLCaseAssertContext assertContext, 
final String actual, final List<String> expected) {
-        if (CollectionUtils.isEmpty(expected)) {
+        if (expected.isEmpty()) {
             assertNull(assertContext.getText("Actual job id should not 
exist."), actual);
         } else {
             assertNotNull(assertContext.getText("Actual job id should 
exist."), actual);
diff --git 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/ResetScalingStatementAssert.java
 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/ResetScalingStatementAssert.java
index 2d1557a..4a51c3c 100644
--- 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/ResetScalingStatementAssert.java
+++ 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/ResetScalingStatementAssert.java
@@ -17,7 +17,6 @@
 
 package 
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.scaling.update;
 
-import org.apache.commons.collections4.CollectionUtils;
 import 
org.apache.shardingsphere.scaling.distsql.statement.ResetScalingStatement;
 import 
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
 import 
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.scaling.ResetScalingStatementTestCase;
@@ -25,8 +24,8 @@ import 
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
 
 /**
@@ -51,7 +50,7 @@ public final class ResetScalingStatementAssert {
     }
     
     private static void assertJobIds(final SQLCaseAssertContext assertContext, 
final String actual, final List<String> expected) {
-        if (CollectionUtils.isEmpty(expected)) {
+        if (expected.isEmpty()) {
             assertNull(assertContext.getText("Actual job id should not 
exist."), actual);
         } else {
             assertNotNull(assertContext.getText("Actual job id should 
exist."), actual);
diff --git 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/RestoreScalingSourceWritingStatementAssert.java
 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/RestoreScalingSourceWritingStatementAssert.java
index 8fcbe1b..8867977 100644
--- 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/RestoreScalingSourceWritingStatementAssert.java
+++ 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/RestoreScalingSourceWritingStatementAssert.java
@@ -17,7 +17,6 @@
 
 package 
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.scaling.update;
 
-import org.apache.commons.collections4.CollectionUtils;
 import 
org.apache.shardingsphere.scaling.distsql.statement.RestoreScalingSourceWritingStatement;
 import 
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
 import 
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.scaling.RestoreScalingSourceWritingStatementTestCase;
@@ -51,7 +50,7 @@ public final class RestoreScalingSourceWritingStatementAssert 
{
     }
     
     private static void assertJobIds(final SQLCaseAssertContext assertContext, 
final String actual, final List<String> expected) {
-        if (CollectionUtils.isEmpty(expected)) {
+        if (expected.isEmpty()) {
             assertNull(assertContext.getText("Actual job id should not 
exist."), actual);
         } else {
             assertNotNull(assertContext.getText("Actual job id should 
exist."), actual);
diff --git 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/StartScalingStatementAssert.java
 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/StartScalingStatementAssert.java
index baeb2c0..c700732 100644
--- 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/StartScalingStatementAssert.java
+++ 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/StartScalingStatementAssert.java
@@ -17,10 +17,10 @@
 
 package 
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.scaling.update;
 
-import org.apache.commons.collections4.CollectionUtils;
 import 
org.apache.shardingsphere.scaling.distsql.statement.StartScalingStatement;
 import 
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
 import 
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.scaling.StartScalingStatementTestCase;
+
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
@@ -50,7 +50,7 @@ public final class StartScalingStatementAssert {
     }
     
     private static void assertJobIds(final SQLCaseAssertContext assertContext, 
final String actual, final List<String> expected) {
-        if (CollectionUtils.isEmpty(expected)) {
+        if (expected.isEmpty()) {
             assertNull(assertContext.getText("Actual job id should not 
exist."), actual);
         } else {
             assertNotNull(assertContext.getText("Actual job id should 
exist."), actual);
diff --git 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/StopScalingSourceWritingStatementAssert.java
 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/StopScalingSourceWritingStatementAssert.java
index e4f6cfc..7ebc7b2 100644
--- 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/StopScalingSourceWritingStatementAssert.java
+++ 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/StopScalingSourceWritingStatementAssert.java
@@ -17,7 +17,6 @@
 
 package 
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.scaling.update;
 
-import org.apache.commons.collections4.CollectionUtils;
 import 
org.apache.shardingsphere.scaling.distsql.statement.StopScalingSourceWritingStatement;
 import 
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
 import 
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.scaling.StopScalingSourceWritingStatementTestCase;
@@ -51,7 +50,7 @@ public final class StopScalingSourceWritingStatementAssert {
     }
     
     private static void assertJobIds(final SQLCaseAssertContext assertContext, 
final String actual, final List<String> expected) {
-        if (CollectionUtils.isEmpty(expected)) {
+        if (expected.isEmpty()) {
             assertNull(assertContext.getText("Actual job id should not 
exist."), actual);
         } else {
             assertNotNull(assertContext.getText("Actual job id should 
exist."), actual);
diff --git 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/StopScalingStatementAssert.java
 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/StopScalingStatementAssert.java
index b6d1a1f..dce1781 100644
--- 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/StopScalingStatementAssert.java
+++ 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/asserts/statement/distsql/ral/impl/scaling/update/StopScalingStatementAssert.java
@@ -17,7 +17,6 @@
 
 package 
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.statement.distsql.ral.impl.scaling.update;
 
-import org.apache.commons.collections4.CollectionUtils;
 import 
org.apache.shardingsphere.scaling.distsql.statement.StopScalingStatement;
 import 
org.apache.shardingsphere.test.sql.parser.parameterized.asserts.SQLCaseAssertContext;
 import 
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.scaling.StopScalingStatementTestCase;
@@ -25,9 +24,9 @@ import 
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain
 import java.util.List;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
 
 /**
  * Stop scaling statement assert.
@@ -51,7 +50,7 @@ public final class StopScalingStatementAssert {
     }
     
     private static void assertJobIds(final SQLCaseAssertContext assertContext, 
final String actual, final List<String> expected) {
-        if (CollectionUtils.isEmpty(expected)) {
+        if (expected.isEmpty()) {
             assertNull(assertContext.getText("Actual job id should not 
exist."), actual);
         } else {
             assertNotNull(assertContext.getText("Actual job id should 
exist."), actual);
diff --git 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/scaling/CheckScalingStatementTestCase.java
 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/scaling/CheckScalingStatementTestCase.java
index 69c4df6..cb650e8 100644
--- 
a/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/scaling/CheckScalingStatementTestCase.java
+++ 
b/shardingsphere-test/shardingsphere-parser-test/src/main/java/org/apache/shardingsphere/test/sql/parser/parameterized/jaxb/cases/domain/statement/distsql/ral/scaling/CheckScalingStatementTestCase.java
@@ -18,7 +18,6 @@
 package 
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.distsql.ral.scaling;
 
 import lombok.Getter;
-import lombok.Setter;
 import 
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.segment.impl.distsql.ExpectedAlgorithm;
 import 
org.apache.shardingsphere.test.sql.parser.parameterized.jaxb.cases.domain.statement.SQLParserTestCase;
 
@@ -30,7 +29,6 @@ import java.util.List;
  * Check scaling statement test case.
  */
 @Getter
-@Setter
 public final class CheckScalingStatementTestCase extends SQLParserTestCase {
     
     @XmlElement(name = "job-id")

Reply via email to