Refactor PipelineDataSourceCreator

apache · Nov 24, 2023 · 58252dd · 58252dd
1 parent 8a18cdf
commit 58252dd
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/...here/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java b/...here/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
@@ -49,7 +49,7 @@ public final class ShardingSpherePipelineDataSourceCreator implements PipelineDa
     private static final AtomicInteger STANDALONE_DATABASE_ID = new AtomicInteger(1);
 
     @Override
-    public DataSource createPipelineDataSource(final Object dataSourceConfig) throws SQLException {
+    public DataSource create(final Object dataSourceConfig) throws SQLException {
         YamlRootConfiguration rootConfig = YamlEngine.unmarshal(YamlEngine.marshal(dataSourceConfig), YamlRootConfiguration.class);
         removeAuthorityRule(rootConfig);
         updateSingleRuleConfiguration(rootConfig);

diff --git a/.../src/main/java/org/apache/shardingsphere/data/pipeline/spi/PipelineDataSourceCreator.java b/.../src/main/java/org/apache/shardingsphere/data/pipeline/spi/PipelineDataSourceCreator.java
@@ -36,5 +36,5 @@ public interface PipelineDataSourceCreator extends TypedSPI {
      * @return pipeline data source
      * @throws SQLException if create data source failed
      */
-    DataSource createPipelineDataSource(Object dataSourceConfig) throws SQLException;
+    DataSource create(Object dataSourceConfig) throws SQLException;
 }
diff --git a/.../org/apache/shardingsphere/data/pipeline/common/datasource/PipelineDataSourceFactory.java b/.../org/apache/shardingsphere/data/pipeline/common/datasource/PipelineDataSourceFactory.java
@@ -42,7 +42,7 @@ public final class PipelineDataSourceFactory {
     @SneakyThrows(SQLException.class)
     public static PipelineDataSourceWrapper newInstance(final PipelineDataSourceConfiguration pipelineDataSourceConfig) {
         DataSource dataSource = TypedSPILoader.getService(
-                PipelineDataSourceCreator.class, pipelineDataSourceConfig.getType()).createPipelineDataSource(pipelineDataSourceConfig.getDataSourceConfiguration());
+                PipelineDataSourceCreator.class, pipelineDataSourceConfig.getType()).create(pipelineDataSourceConfig.getDataSourceConfiguration());
         return new PipelineDataSourceWrapper(dataSource, pipelineDataSourceConfig.getDatabaseType());
     }
 }
diff --git a/...dingsphere/data/pipeline/common/datasource/creator/StandardPipelineDataSourceCreator.java b/...dingsphere/data/pipeline/common/datasource/creator/StandardPipelineDataSourceCreator.java
@@ -30,7 +30,7 @@
 public final class StandardPipelineDataSourceCreator implements PipelineDataSourceCreator {
 
     @Override
-    public DataSource createPipelineDataSource(final Object dataSourceConfig) {
+    public DataSource create(final Object dataSourceConfig) {
         return DataSourcePoolCreator.create((DataSourcePoolProperties) dataSourceConfig);
     }
 

diff --git a/...rdingsphere/data/pipeline/common/datasource/creator/FixturePipelineDataSourceCreator.java b/...rdingsphere/data/pipeline/common/datasource/creator/FixturePipelineDataSourceCreator.java
@@ -24,7 +24,7 @@
 public final class FixturePipelineDataSourceCreator implements PipelineDataSourceCreator {
 
     @Override
-    public DataSource createPipelineDataSource(final Object dataSourceConfig) {
+    public DataSource create(final Object dataSourceConfig) {
         return null;
     }
 

diff --git a/...shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java b/...shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java
@@ -211,10 +211,10 @@ private void initTableData(final MigrationJobConfiguration jobConfig) {
         PipelineDataSourceConfiguration source = jobConfig.getSources().values().iterator().next();
         PipelineDataSourceConfiguration sourceDataSourceConfig = PipelineDataSourceConfigurationFactory.newInstance(source.getType(), source.getParameter());
         initTableData(TypedSPILoader.getService(
-                PipelineDataSourceCreator.class, sourceDataSourceConfig.getType()).createPipelineDataSource(sourceDataSourceConfig.getDataSourceConfiguration()));
+                PipelineDataSourceCreator.class, sourceDataSourceConfig.getType()).create(sourceDataSourceConfig.getDataSourceConfiguration()));
         PipelineDataSourceConfiguration targetDataSourceConfig = PipelineDataSourceConfigurationFactory.newInstance(jobConfig.getTarget().getType(), jobConfig.getTarget().getParameter());
         initTableData(TypedSPILoader.getService(
-                PipelineDataSourceCreator.class, targetDataSourceConfig.getType()).createPipelineDataSource(targetDataSourceConfig.getDataSourceConfiguration()));
+                PipelineDataSourceCreator.class, targetDataSourceConfig.getType()).create(targetDataSourceConfig.getDataSourceConfiguration()));
     }
 
     private void initTableData(final DataSource pipelineDataSource) throws SQLException {