This is an automated email from the ASF dual-hosted git repository.
azexin 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 3f2bc933be8 Recover methods from public to protected; Move class from
IT to UT module (#22641)
3f2bc933be8 is described below
commit 3f2bc933be88f4ba97c426b23ddb723e1b5f4c11
Author: Hongsheng Zhong <[email protected]>
AuthorDate: Mon Dec 5 09:53:15 2022 +0800
Recover methods from public to protected; Move class from IT to UT module
(#22641)
---
.../algorithm/AbstractStreamingDataConsistencyCalculateAlgorithm.java | 2 +-
.../data/pipeline/core/job/AbstractSimplePipelineJob.java | 2 +-
.../pipeline/core/prepare/datasource/AbstractDataSourcePreparer.java | 4 ++--
.../core/prepare/datasource/AbstractDataSourcePreparerTest.java | 4 +---
.../shardingsphere/data/pipeline/scenario/migration/MigrationJob.java | 2 +-
5 files changed, 6 insertions(+), 8 deletions(-)
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/AbstractStreamingDataConsistencyCalculateAlgorithm.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/AbstractStreamingDataConsistencyCalculateAlgorithm.java
index 168e07108c8..e0600b895bb 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/AbstractStreamingDataConsistencyCalculateAlgorithm.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/check/consistency/algorithm/AbstractStreamingDataConsistencyCalculateAlgorithm.java
@@ -45,7 +45,7 @@ public abstract class
AbstractStreamingDataConsistencyCalculateAlgorithm extends
* @param param data consistency calculate parameter
* @return optional calculated result, empty means there's no more result
*/
- public abstract Optional<DataConsistencyCalculatedResult>
calculateChunk(DataConsistencyCalculateParameter param);
+ protected abstract Optional<DataConsistencyCalculatedResult>
calculateChunk(DataConsistencyCalculateParameter param);
/**
* It's not thread-safe, it should be executed in only one thread at the
same time.
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/AbstractSimplePipelineJob.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/AbstractSimplePipelineJob.java
index 8416a1b9bec..02477826d6d 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/AbstractSimplePipelineJob.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/job/AbstractSimplePipelineJob.java
@@ -35,7 +35,7 @@ public abstract class AbstractSimplePipelineJob extends
AbstractPipelineJob impl
* @param shardingContext sharding context
* @return pipeline job item context
*/
- public abstract PipelineJobItemContext
buildPipelineJobItemContext(ShardingContext shardingContext);
+ protected abstract PipelineJobItemContext
buildPipelineJobItemContext(ShardingContext shardingContext);
protected abstract PipelineTasksRunner
buildPipelineTasksRunner(PipelineJobItemContext pipelineJobItemContext);
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparer.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparer.java
index 8b0c2bf1c24..521cf0e8307 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparer.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparer.java
@@ -97,7 +97,7 @@ public abstract class AbstractDataSourcePreparer implements
DataSourcePreparer {
* @param sql SQL
* @throws SQLException SQL exception
*/
- public final void executeTargetTableSQL(final Connection targetConnection,
final String sql) throws SQLException {
+ protected final void executeTargetTableSQL(final Connection
targetConnection, final String sql) throws SQLException {
log.info("execute target table sql: {}", sql);
try (Statement statement = targetConnection.createStatement()) {
statement.execute(sql);
@@ -118,7 +118,7 @@ public abstract class AbstractDataSourcePreparer implements
DataSourcePreparer {
* @param createTableSQL create table SQL
* @return create table if not existed SQL
*/
- public final String addIfNotExistsForCreateTableSQL(final String
createTableSQL) {
+ protected final String addIfNotExistsForCreateTableSQL(final String
createTableSQL) {
if (PATTERN_CREATE_TABLE_IF_NOT_EXISTS.matcher(createTableSQL).find())
{
return createTableSQL;
}
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparerTest.java
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparerTest.java
similarity index 91%
rename from
test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparerTest.java
rename to
kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparerTest.java
index 02756e54149..a8bb9dc2da9 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparerTest.java
+++
b/kernel/data-pipeline/core/src/test/java/org/apache/shardingsphere/data/pipeline/core/prepare/datasource/AbstractDataSourcePreparerTest.java
@@ -15,10 +15,8 @@
* limitations under the License.
*/
-package
org.apache.shardingsphere.test.it.data.pipeline.core.prepare.datasource;
+package org.apache.shardingsphere.data.pipeline.core.prepare.datasource;
-import
org.apache.shardingsphere.data.pipeline.core.prepare.datasource.AbstractDataSourcePreparer;
-import
org.apache.shardingsphere.data.pipeline.core.prepare.datasource.PrepareTargetTablesParameter;
import org.junit.Test;
import java.sql.Connection;
diff --git
a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJob.java
b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJob.java
index 1005211c95d..97e6eeef224 100644
---
a/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJob.java
+++
b/kernel/data-pipeline/scenario/migration/src/main/java/org/apache/shardingsphere/data/pipeline/scenario/migration/MigrationJob.java
@@ -54,7 +54,7 @@ public final class MigrationJob extends
AbstractSimplePipelineJob {
private final MigrationJobPreparer jobPreparer = new
MigrationJobPreparer();
@Override
- public InventoryIncrementalJobItemContext
buildPipelineJobItemContext(final ShardingContext shardingContext) {
+ protected InventoryIncrementalJobItemContext
buildPipelineJobItemContext(final ShardingContext shardingContext) {
int shardingItem = shardingContext.getShardingItem();
MigrationJobConfiguration jobConfig = new
YamlMigrationJobConfigurationSwapper().swapToObject(shardingContext.getJobParameter());
InventoryIncrementalJobItemProgress initProgress =
jobAPI.getJobItemProgress(shardingContext.getJobName(), shardingItem);
