Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor PipelineDataSourceCreator #29196

Merged
merged 1 commit into from
Nov 24, 2023
Merged

Refactor PipelineDataSourceCreator #29196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...here/driver/data/pipeline/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion .../src/main/java/org/apache/shardingsphere/data/pipeline/spi/PipelineDataSourceCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 1 addition & 1 deletion .../org/apache/shardingsphere/data/pipeline/common/datasource/PipelineDataSourceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
2 changes: 1 addition & 1 deletion ...dingsphere/data/pipeline/common/datasource/creator/StandardPipelineDataSourceCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
2 changes: 1 addition & 1 deletion ...rdingsphere/data/pipeline/common/datasource/creator/FixturePipelineDataSourceCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
4 changes: 2 additions & 2 deletions ...shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down