[shardingsphere] branch master updated: Refactor RuleAlteredJobConfigurationPreparer, use Collection instead of List (#14321)

[duanzhengqiang]

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

duanzhengqiang 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 4259896  Refactor RuleAlteredJobConfigurationPreparer, use Collection 
instead of List (#14321)
4259896 is described below

commit 4259896069627b989fbf6fe1e04b20bf57f225aa
Author: Liang Zhang <terrym...@163.com>
AuthorDate: Sat Dec 25 17:30:50 2021 +0800

    Refactor RuleAlteredJobConfigurationPreparer, use Collection instead of 
List (#14321)
---
 .../schedule/ShardingRuleAlteredJobConfigurationPreparer.java  | 10 ++--------
 .../spi/rulealtered/RuleAlteredJobConfigurationPreparer.java   |  4 ++--
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git 
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/schedule/ShardingRuleAlteredJobConfigurationPreparer.java
 
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/schedule/ShardingRuleAlteredJobConfigurationPreparer.java
index 98a0e08..d244975 100644
--- 
a/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/schedule/ShardingRuleAlteredJobConfigurationPreparer.java
+++ 
b/shardingsphere-features/shardingsphere-sharding/shardingsphere-sharding-core/src/main/java/org/apache/shardingsphere/sharding/schedule/ShardingRuleAlteredJobConfigurationPreparer.java
@@ -84,12 +84,6 @@ public final class 
ShardingRuleAlteredJobConfigurationPreparer implements RuleAl
         return result;
     }
     
-    /**
-     * Get scaling actual data nodes.
-     *
-     * @param ruleConfig rule configuration
-     * @return map(logic table name, DataNode of each logic table)
-     */
     private static Map<String, List<DataNode>> 
getShouldScalingActualDataNodes(final RuleConfiguration ruleConfig) {
         JDBCDataSourceConfiguration sourceConfig = 
JDBCDataSourceConfigurationFactory.newInstance(ruleConfig.getSource().getType(),
 ruleConfig.getSource().getParameter());
         Preconditions.checkState(sourceConfig instanceof 
ShardingSphereJDBCDataSourceConfiguration,
@@ -127,8 +121,8 @@ public final class 
ShardingRuleAlteredJobConfigurationPreparer implements RuleAl
     }
     
     @Override
-    public List<TaskConfiguration> createTaskConfigurations(final 
RuleConfiguration ruleConfig, final HandleConfiguration handleConfig) {
-        List<TaskConfiguration> result = new LinkedList<>();
+    public Collection<TaskConfiguration> createTaskConfigurations(final 
RuleConfiguration ruleConfig, final HandleConfiguration handleConfig) {
+        Collection<TaskConfiguration> result = new LinkedList<>();
         ShardingSphereJDBCDataSourceConfiguration sourceConfig = 
getSourceConfiguration(ruleConfig);
         ShardingRuleConfiguration sourceRuleConfig = 
ShardingRuleConfigurationConverter.findAndConvertShardingRuleConfiguration(sourceConfig.getRootConfig().getRules());
         Map<String, DataSourceConfiguration> sourceDataSource = new 
YamlDataSourceConfigurationSwapper().getDataSourceConfigurations(sourceConfig.getRootConfig());
diff --git 
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/spi/rulealtered/RuleAlteredJobConfigurationPreparer.java
 
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/spi/rulealtered/RuleAlteredJobConfigurationPreparer.java
index fbd57eb..46294d4 100644
--- 
a/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/spi/rulealtered/RuleAlteredJobConfigurationPreparer.java
+++ 
b/shardingsphere-kernel/shardingsphere-data-pipeline/shardingsphere-data-pipeline-core/src/main/java/org/apache/shardingsphere/data/pipeline/spi/rulealtered/RuleAlteredJobConfigurationPreparer.java
@@ -22,7 +22,7 @@ import 
org.apache.shardingsphere.data.pipeline.api.config.rulealtered.RuleConfig
 import 
org.apache.shardingsphere.data.pipeline.api.config.rulealtered.TaskConfiguration;
 import org.apache.shardingsphere.spi.required.RequiredSPI;
 
-import java.util.List;
+import java.util.Collection;
 
 /**
  * Rule altered job configuration preparer.
@@ -45,5 +45,5 @@ public interface RuleAlteredJobConfigurationPreparer extends 
RequiredSPI {
      * @param handleConfig handle configuration
      * @return task configurations
      */
-    List<TaskConfiguration> createTaskConfigurations(RuleConfiguration 
ruleConfig, HandleConfiguration handleConfig);
+    Collection<TaskConfiguration> createTaskConfigurations(RuleConfiguration 
ruleConfig, HandleConfiguration handleConfig);
 }