This is an automated email from the ASF dual-hosted git repository.
jianglongtao 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 4259b5a3421 Rename xxUtil to xxUtils (#24831)
4259b5a3421 is described below
commit 4259b5a342115941bd703f53aa50886b0d0da7f8
Author: yx9o <[email protected]>
AuthorDate: Mon Mar 27 09:55:12 2023 +0800
Rename xxUtil to xxUtils (#24831)
* Rename xxUtil to xxUtils
* Update
---
.../ProxyClusterContainerConfigurationFactory.java | 4 ++--
.../impl/ShardingSphereProxyClusterContainer.java | 4 ++--
.../ShardingSphereProxyStandaloneContainer.java | 4 ++--
.../atomic/storage/DockerStorageContainer.java | 4 ++--
.../atomic/storage/EmbeddedStorageContainer.java | 6 ++---
.../mysql/MySQLContainerConfigurationFactory.java | 4 ++--
...ntainerUtil.java => AdapterContainerUtils.java} | 4 ++--
.../{ContainerUtil.java => ContainerUtils.java} | 6 ++---
...atabaseTypeUtil.java => DatabaseTypeUtils.java} | 5 ++++-
...ntainerUtil.java => StorageContainerUtils.java} | 10 ++++-----
.../container/compose/DockerContainerComposer.java | 10 ++++-----
.../config/MySQLContainerConfigurationFactory.java | 8 +++----
.../ProxyClusterContainerConfigurationFactory.java | 4 ++--
...ainerUtil.java => DiscoveryContainerUtils.java} | 4 ++--
.../pipeline/cases/PipelineContainerComposer.java | 18 +++++++--------
.../test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java | 10 ++++-----
.../cases/cdc/DataSourceRecordConsumer.java | 10 ++++-----
.../createtable/CreateTableSQLGeneratorIT.java | 4 ++--
.../cases/migration/AbstractMigrationE2EIT.java | 6 ++---
.../general/MySQLMigrationGeneralE2EIT.java | 6 ++---
.../general/PostgreSQLMigrationGeneralE2EIT.java | 6 ++---
.../primarykey/TextPrimaryKeyMigrationE2EIT.java | 4 ++--
.../pipeline/cases/task/E2EIncrementalTask.java | 26 +++++++++++-----------
.../pipeline/cases/task/MySQLIncrementTask.java | 10 ++++-----
.../cases/task/PostgreSQLIncrementTask.java | 8 +++----
.../container/compose/DockerContainerComposer.java | 4 ++--
...eProxyClusterContainerConfigurationFactory.java | 12 +++++-----
...xecuteUtil.java => DataSourceExecuteUtils.java} | 4 ++--
.../{SQLBuilderUtil.java => SQLBuilderUtils.java} | 4 ++--
.../ClusterShowProcessListContainerComposer.java | 4 ++--
.../engine/base/TransactionContainerComposer.java | 4 ++--
.../ProxyClusterContainerConfigurationFactory.java | 8 +++----
.../compose/mode/ClusterContainerComposer.java | 4 ++--
...oxyStandaloneContainerConfigurationFactory.java | 4 ++--
.../api/impl/GovernanceRepositoryAPIImplTest.java | 16 ++++++-------
...lineProcessConfigurationPersistServiceTest.java | 4 ++--
.../DefaultPipelineDataSourceManagerTest.java | 4 ++--
.../core/prepare/InventoryTaskSplitterTest.java | 6 ++---
.../pipeline/core/task/IncrementalTaskTest.java | 8 +++----
.../data/pipeline/core/task/InventoryTaskTest.java | 16 ++++++-------
...eContextUtil.java => PipelineContextUtils.java} | 7 ++++--
.../core/util/PipelineDistributedBarrierTest.java | 2 +-
.../consistencycheck/ConsistencyCheckJobTest.java | 4 ++--
.../api/impl/ConsistencyCheckJobAPITest.java | 4 ++--
.../migration/api/impl/MigrationJobAPITest.java | 8 +++----
.../MigrationDataConsistencyCheckerTest.java | 6 ++---
46 files changed, 162 insertions(+), 156 deletions(-)
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/config/ProxyClusterContainerConfigurationFactory.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/config/ProxyClusterContainerConfigurationFactory.java
index 8b907c30417..77cd0254c6e 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/config/ProxyClusterContainerConfigurationFactory.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/config/ProxyClusterContainerConfigurationFactory.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtils;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
import java.util.Collections;
@@ -37,7 +37,7 @@ public final class ProxyClusterContainerConfigurationFactory {
* @return created instance
*/
public static AdaptorContainerConfiguration newInstance() {
- return new AdaptorContainerConfiguration("", getMountedResources(),
AdapterContainerUtil.getAdapterContainerImage());
+ return new AdaptorContainerConfiguration("", getMountedResources(),
AdapterContainerUtils.getAdapterContainerImage());
}
private static Map<String, String> getMountedResources() {
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
index 73ee519b670..cc423df3350 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyClusterContainer.java
@@ -22,7 +22,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
import
org.apache.shardingsphere.test.e2e.env.container.wait.JdbcConnectionWaitStrategy;
import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
import org.testcontainers.containers.BindMode;
@@ -79,7 +79,7 @@ public final class ShardingSphereProxyClusterContainer
extends DockerITContainer
public DataSource getTargetDataSource(final String serverLists) {
DataSource dataSource = targetDataSourceProvider.get();
if (Objects.isNull(dataSource)) {
-
targetDataSourceProvider.set(StorageContainerUtil.generateDataSource(DataSourceEnvironment.getURL(databaseType,
getHost(), getMappedPort(3307), config.getProxyDataSourceName()),
+
targetDataSourceProvider.set(StorageContainerUtils.generateDataSource(DataSourceEnvironment.getURL(databaseType,
getHost(), getMappedPort(3307), config.getProxyDataSourceName()),
ProxyContainerConstants.USERNAME,
ProxyContainerConstants.PASSWORD));
}
return targetDataSourceProvider.get();
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
index de80d60d302..0cf5b21e246 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/impl/ShardingSphereProxyStandaloneContainer.java
@@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
import
org.apache.shardingsphere.test.e2e.env.container.wait.JdbcConnectionWaitStrategy;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
@@ -81,7 +81,7 @@ public final class ShardingSphereProxyStandaloneContainer
extends DockerITContai
public DataSource getTargetDataSource(final String serverLists) {
DataSource dataSource = targetDataSourceProvider.get();
if (Objects.isNull(dataSource)) {
-
targetDataSourceProvider.set(StorageContainerUtil.generateDataSource(DataSourceEnvironment.getURL(databaseType,
getHost(), getMappedPort(3307), config.getProxyDataSourceName()),
+
targetDataSourceProvider.set(StorageContainerUtils.generateDataSource(DataSourceEnvironment.getURL(databaseType,
getHost(), getMappedPort(3307), config.getProxyDataSourceName()),
ProxyContainerConstants.USERNAME,
ProxyContainerConstants.PASSWORD));
}
return targetDataSourceProvider.get();
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/DockerStorageContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/DockerStorageContainer.java
index ff4de0e4364..4779a0e074a 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/DockerStorageContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/DockerStorageContainer.java
@@ -25,7 +25,7 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
import
org.apache.shardingsphere.test.e2e.env.container.wait.JdbcConnectionWaitStrategy;
import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.database.DatabaseEnvironmentManager;
@@ -114,7 +114,7 @@ public abstract class DockerStorageContainer extends
DockerITContainer implement
* @return access data source
*/
public DataSource createAccessDataSource(final String dataSourceName) {
- return
StorageContainerUtil.generateDataSource(getJdbcUrl(dataSourceName),
getUsername(), getPassword(), 4);
+ return
StorageContainerUtils.generateDataSource(getJdbcUrl(dataSourceName),
getUsername(), getPassword(), 4);
}
/**
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/EmbeddedStorageContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/EmbeddedStorageContainer.java
index 8fd5ecb48bf..15bea8bdaaf 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/EmbeddedStorageContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/EmbeddedStorageContainer.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.test.e2e.env.container.atomic.storage;
import lombok.Getter;
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.EmbeddedITContainer;
import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.database.DatabaseEnvironmentManager;
@@ -57,7 +57,7 @@ public abstract class EmbeddedStorageContainer implements
EmbeddedITContainer, S
private Map<String, DataSource> createActualDataSourceMap() {
Collection<String> databaseNames =
DatabaseEnvironmentManager.getDatabaseNames(scenario);
Map<String, DataSource> result = new
LinkedHashMap<>(databaseNames.size(), 1);
- databaseNames.forEach(each -> result.put(each,
StorageContainerUtil.generateDataSource(DataSourceEnvironment.getURL(databaseType,
null, 0, scenario + each),
+ databaseNames.forEach(each -> result.put(each,
StorageContainerUtils.generateDataSource(DataSourceEnvironment.getURL(databaseType,
null, 0, scenario + each),
"root", "Root@123")));
return result;
}
@@ -66,7 +66,7 @@ public abstract class EmbeddedStorageContainer implements
EmbeddedITContainer, S
private Map<String, DataSource> createExpectedDataSourceMap() {
Collection<String> databaseNames =
DatabaseEnvironmentManager.getExpectedDatabaseNames(scenario);
Map<String, DataSource> result = new
LinkedHashMap<>(databaseNames.size(), 1);
- databaseNames.forEach(each -> result.put(each,
StorageContainerUtil.generateDataSource(DataSourceEnvironment.getURL(databaseType,
null, 0, scenario + each),
+ databaseNames.forEach(each -> result.put(each,
StorageContainerUtils.generateDataSource(DataSourceEnvironment.getURL(databaseType,
null, 0, scenario + each),
"root", "Root@123")));
return result;
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/impl/mysql/MySQLContainerConfigurationFactory.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/impl/mysql/MySQLContainerConfigurationFactory.java
index 6f76b0c43a2..e8c8a4f1740 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/impl/mysql/MySQLContainerConfigurationFactory.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/storage/config/impl/mysql/MySQLContainerConfigurationFactory.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.MySQLContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.ContainerUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.ContainerUtils;
import java.util.Collections;
import java.util.HashMap;
@@ -58,7 +58,7 @@ public final class MySQLContainerConfigurationFactory {
}
private static String getCommand() {
- return "--server-id=" + ContainerUtil.generateMySQLServerId();
+ return "--server-id=" + ContainerUtils.generateMySQLServerId();
}
private static Map<String, String> getContainerEnvironments() {
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/AdapterContainerUtil.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/AdapterContainerUtils.java
similarity index 94%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/AdapterContainerUtil.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/AdapterContainerUtils.java
index 8f782ab0e64..c4414b9a42c 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/AdapterContainerUtil.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/AdapterContainerUtils.java
@@ -22,10 +22,10 @@ import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
/**
- * Adapter Container Util.
+ * Adapter container utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public class AdapterContainerUtil {
+public final class AdapterContainerUtils {
/**
* Get adapter container image.
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/ContainerUtil.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/ContainerUtils.java
similarity index 95%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/ContainerUtil.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/ContainerUtils.java
index 9d9c35a5a48..da41bcc682e 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/ContainerUtil.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/ContainerUtils.java
@@ -23,10 +23,10 @@ import lombok.NoArgsConstructor;
import java.util.concurrent.atomic.AtomicInteger;
/**
- * Container util.
+ * Container utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class ContainerUtil {
+public final class ContainerUtils {
private static final AtomicInteger ATOMIC_MYSQL_SERVER_ID = new
AtomicInteger(1);
@@ -34,7 +34,7 @@ public final class ContainerUtil {
/**
* Generate a unique MySQL server id.
- *
+ *
* @return unique MySQL server id
*/
public static int generateMySQLServerId() {
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DatabaseTypeUtil.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DatabaseTypeUtils.java
similarity index 97%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DatabaseTypeUtil.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DatabaseTypeUtils.java
index 62135feba2a..87f533682f8 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DatabaseTypeUtil.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/DatabaseTypeUtils.java
@@ -25,8 +25,11 @@ import
org.apache.shardingsphere.infra.database.type.dialect.MySQLDatabaseType;
import
org.apache.shardingsphere.infra.database.type.dialect.OpenGaussDatabaseType;
import
org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseType;
+/**
+ * Database type utility class.
+ */
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class DatabaseTypeUtil {
+public final class DatabaseTypeUtils {
/**
* Check MySQL database type.
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/StorageContainerUtil.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/StorageContainerUtils.java
similarity index 94%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/StorageContainerUtil.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/StorageContainerUtils.java
index 4ff8b80c7af..549a5c3649c 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/StorageContainerUtil.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/util/StorageContainerUtils.java
@@ -27,14 +27,14 @@ import
org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
import javax.sql.DataSource;
/**
- * Storage container util.
+ * Storage container utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class StorageContainerUtil {
+public final class StorageContainerUtils {
/**
- * Generate datasource.
- *
+ * Generate datasource.
+ *
* @param jdbcUrl JDBC URL for generating datasource
* @param username username
* @param password password
@@ -45,7 +45,7 @@ public final class StorageContainerUtil {
}
/**
- * Generate datasource.
+ * Generate datasource.
*
* @param jdbcUrl JDBC URL for generating datasource
* @param username username
diff --git
a/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/compose/DockerContainerComposer.java
b/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/compose/DockerContainerComposer.java
index c25203f8068..4cf9c0d0f99 100644
---
a/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/compose/DockerContainerComposer.java
+++
b/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/compose/DockerContainerComposer.java
@@ -34,8 +34,8 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.impl.Z
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.DockerStorageContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.ContainerUtil;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.ContainerUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
import javax.sql.DataSource;
@@ -69,7 +69,7 @@ public final class DockerContainerComposer extends
BaseContainerComposer {
List<StorageContainerConfiguration> containerConfigs =
MySQLContainerConfigurationFactory.newInstance(scenario, databaseType);
containerConfigs.forEach(each -> {
DockerStorageContainer storageContainer =
getContainers().registerContainer((DockerStorageContainer)
StorageContainerFactory.newInstance(databaseType, storageContainerImage, null,
each));
-
storageContainer.setNetworkAliases(Collections.singletonList(databaseType.getType().toLowerCase()
+ "_" + ContainerUtil.generateStorageContainerId()));
+
storageContainer.setNetworkAliases(Collections.singletonList(databaseType.getType().toLowerCase()
+ "_" + ContainerUtils.generateStorageContainerId()));
storageContainers.add(storageContainer);
});
AdaptorContainerConfiguration containerConfig =
ProxyClusterContainerConfigurationFactory.newInstance(scenario);
@@ -81,7 +81,7 @@ public final class DockerContainerComposer extends
BaseContainerComposer {
@Override
public DataSource getProxyDatasource() {
- return
StorageContainerUtil.generateDataSource(DataSourceEnvironment.getURL(databaseType,
proxyContainer.getHost(), proxyContainer.getFirstMappedPort(), ""),
+ return
StorageContainerUtils.generateDataSource(DataSourceEnvironment.getURL(databaseType,
proxyContainer.getHost(), proxyContainer.getFirstMappedPort(), ""),
ProxyContainerConstants.USERNAME,
ProxyContainerConstants.PASSWORD);
}
@@ -89,7 +89,7 @@ public final class DockerContainerComposer extends
BaseContainerComposer {
public List<DataSource> getMappedDatasource() {
return getStorageContainers().stream()
.map(each -> DataSourceEnvironment.getURL(databaseType,
each.getHost(), each.getMappedPort(), ""))
- .map(each -> StorageContainerUtil.generateDataSource(each,
StorageContainerConstants.USERNAME, StorageContainerConstants.PASSWORD))
+ .map(each -> StorageContainerUtils.generateDataSource(each,
StorageContainerConstants.USERNAME, StorageContainerConstants.PASSWORD))
.collect(Collectors.toList());
}
}
diff --git
a/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/config/MySQLContainerConfigurationFactory.java
b/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/config/MySQLContainerConfigurationFactory.java
index 2090c568dc5..12d9820141c 100644
---
a/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/config/MySQLContainerConfigurationFactory.java
+++
b/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/config/MySQLContainerConfigurationFactory.java
@@ -20,10 +20,10 @@ package
org.apache.shardingsphere.test.e2e.discovery.framework.container.config;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.discovery.util.DiscoveryContainerUtil;
+import
org.apache.shardingsphere.test.e2e.discovery.util.DiscoveryContainerUtils;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.StorageContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.MySQLContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.ContainerUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.ContainerUtils;
import java.util.Collections;
import java.util.HashMap;
@@ -45,7 +45,7 @@ public final class MySQLContainerConfigurationFactory {
* @return created instance
*/
public static List<StorageContainerConfiguration> newInstance(final String
scenario, final DatabaseType databaseType) {
- Integer containerQuantity =
DiscoveryContainerUtil.loadContainerRawNamesAndQuantity(scenario).get(databaseType.getType().toLowerCase());
+ Integer containerQuantity =
DiscoveryContainerUtils.loadContainerRawNamesAndQuantity(scenario).get(databaseType.getType().toLowerCase());
List<StorageContainerConfiguration> result = new LinkedList<>();
for (int i = 1; i <= containerQuantity; i++) {
result.add(new StorageContainerConfiguration(getCommand(),
getContainerEnvironments(), getMountedResources(scenario, databaseType, i)));
@@ -54,7 +54,7 @@ public final class MySQLContainerConfigurationFactory {
}
private static String getCommand() {
- return "--server-id=" + ContainerUtil.generateMySQLServerId();
+ return "--server-id=" + ContainerUtils.generateMySQLServerId();
}
private static Map<String, String> getContainerEnvironments() {
diff --git
a/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/config/ProxyClusterContainerConfigurationFactory.java
b/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/config/ProxyClusterContainerConfigurationFactory.java
index bfa0fae4aeb..6269c4b5600 100644
---
a/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/config/ProxyClusterContainerConfigurationFactory.java
+++
b/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/config/ProxyClusterContainerConfigurationFactory.java
@@ -21,7 +21,7 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtils;
import java.util.HashMap;
import java.util.Map;
@@ -39,7 +39,7 @@ public final class ProxyClusterContainerConfigurationFactory {
* @return created instance
*/
public static AdaptorContainerConfiguration newInstance(final String
scenario) {
- return new AdaptorContainerConfiguration("",
getMountedResources(scenario), AdapterContainerUtil.getAdapterContainerImage());
+ return new AdaptorContainerConfiguration("",
getMountedResources(scenario),
AdapterContainerUtils.getAdapterContainerImage());
}
private static Map<String, String> getMountedResources(final String
scenario) {
diff --git
a/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/util/DiscoveryContainerUtil.java
b/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/util/DiscoveryContainerUtils.java
similarity index 96%
rename from
test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/util/DiscoveryContainerUtil.java
rename to
test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/util/DiscoveryContainerUtils.java
index 7570267506b..480bd92e7f4 100644
---
a/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/util/DiscoveryContainerUtil.java
+++
b/test/e2e/operation/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/util/DiscoveryContainerUtils.java
@@ -26,10 +26,10 @@ import java.util.HashMap;
import java.util.Map;
/**
- * Discovery container utility.
+ * Discovery container utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class DiscoveryContainerUtil {
+public final class DiscoveryContainerUtils {
/**
* Get container names and quantity.
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
index 5a3a9cf812d..1bd111992c9 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/PipelineContainerComposer.java
@@ -38,8 +38,8 @@ import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.container.comp
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineTestParameter;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.DockerStorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtil;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
@@ -123,15 +123,15 @@ public final class PipelineContainerComposer implements
AutoCloseable {
}
extraSQLCommand =
JAXB.unmarshal(Objects.requireNonNull(PipelineContainerComposer.class.getClassLoader().getResource(testParam.getScenario())),
ExtraSQLCommand.class);
containerComposer.start();
- sourceDataSource =
StorageContainerUtil.generateDataSource(appendExtraParameter(getActualJdbcUrlTemplate(DS_0,
false)), username, password);
- proxyDataSource = StorageContainerUtil.generateDataSource(
+ sourceDataSource =
StorageContainerUtils.generateDataSource(appendExtraParameter(getActualJdbcUrlTemplate(DS_0,
false)), username, password);
+ proxyDataSource = StorageContainerUtils.generateDataSource(
appendExtraParameter(containerComposer.getProxyJdbcUrl(PROXY_DATABASE)),
ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD);
init(jobType);
}
@SneakyThrows(SQLException.class)
private void init(final JobType jobType) {
- String jdbcUrl =
containerComposer.getProxyJdbcUrl(DatabaseTypeUtil.isPostgreSQL(databaseType)
|| DatabaseTypeUtil.isOpenGauss(databaseType) ? "postgres" : "");
+ String jdbcUrl =
containerComposer.getProxyJdbcUrl(DatabaseTypeUtils.isPostgreSQL(databaseType)
|| DatabaseTypeUtils.isOpenGauss(databaseType) ? "postgres" : "");
try (Connection connection = DriverManager.getConnection(jdbcUrl,
ProxyContainerConstants.USERNAME, ProxyContainerConstants.PASSWORD)) {
cleanUpPipelineJobs(connection, jobType);
cleanUpProxyDatabase(connection);
@@ -203,10 +203,10 @@ public final class PipelineContainerComposer implements
AutoCloseable {
* @return appended JDBC URL
*/
public String appendExtraParameter(final String jdbcUrl) {
- if (DatabaseTypeUtil.isMySQL(databaseType)) {
+ if (DatabaseTypeUtils.isMySQL(databaseType)) {
return new JdbcUrlAppender().appendQueryProperties(jdbcUrl,
PropertiesBuilder.build(new Property("rewriteBatchedStatements",
Boolean.TRUE.toString())));
}
- if (DatabaseTypeUtil.isPostgreSQL(databaseType) ||
DatabaseTypeUtil.isOpenGauss(databaseType)) {
+ if (DatabaseTypeUtils.isPostgreSQL(databaseType) ||
DatabaseTypeUtils.isOpenGauss(databaseType)) {
return new JdbcUrlAppender().appendQueryProperties(jdbcUrl,
PropertiesBuilder.build(new Property("stringtype", "unspecified")));
}
return jdbcUrl;
@@ -302,9 +302,9 @@ public final class PipelineContainerComposer implements
AutoCloseable {
* @throws SQLException SQL exception
*/
public void createSourceTableIndexList(final String schema, final String
sourceTableName) throws SQLException {
- if (DatabaseTypeUtil.isPostgreSQL(getDatabaseType())) {
+ if (DatabaseTypeUtils.isPostgreSQL(getDatabaseType())) {
sourceExecuteWithLog(String.format("CREATE INDEX IF NOT EXISTS
idx_user_id ON %s.%s ( user_id )", schema, sourceTableName));
- } else if (DatabaseTypeUtil.isOpenGauss(getDatabaseType())) {
+ } else if (DatabaseTypeUtils.isOpenGauss(getDatabaseType())) {
sourceExecuteWithLog(String.format("CREATE INDEX idx_user_id ON
%s.%s ( user_id )", schema, sourceTableName));
}
}
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java
index 98da9afa77e..2a514cc8d99 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/CDCE2EIT.java
@@ -48,9 +48,9 @@ import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.Pipeline
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineE2ESettings.PipelineE2EDatabaseSettings;
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineE2ETestCaseArgumentsProvider;
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineTestParameter;
-import
org.apache.shardingsphere.test.e2e.data.pipeline.util.DataSourceExecuteUtil;
+import
org.apache.shardingsphere.test.e2e.data.pipeline.util.DataSourceExecuteUtils;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
@@ -113,7 +113,7 @@ class CDCE2EIT {
DataSource jdbcDataSource =
containerComposer.generateShardingSphereDataSourceFromProxy();
Pair<List<Object[]>, List<Object[]>> dataPair =
PipelineCaseHelper.generateFullInsertData(containerComposer.getDatabaseType(),
PipelineContainerComposer.TABLE_INIT_ROW_COUNT);
log.info("init data begin: {}", LocalDateTime.now());
- DataSourceExecuteUtil.execute(jdbcDataSource,
containerComposer.getExtraSQLCommand().getFullInsertOrder(SOURCE_TABLE_NAME),
dataPair.getLeft());
+ DataSourceExecuteUtils.execute(jdbcDataSource,
containerComposer.getExtraSQLCommand().getFullInsertOrder(SOURCE_TABLE_NAME),
dataPair.getLeft());
log.info("init data end: {}", LocalDateTime.now());
try (
Connection connection =
DriverManager.getConnection(containerComposer.getActualJdbcUrlTemplate(PipelineContainerComposer.DS_4,
false),
@@ -137,7 +137,7 @@ class CDCE2EIT {
SchemaTableName schemaTableName =
containerComposer.getDatabaseType().isSchemaAvailable()
? new SchemaTableName(new
SchemaName(PipelineContainerComposer.SCHEMA_NAME), new
TableName(SOURCE_TABLE_NAME))
: new SchemaTableName(new SchemaName(null), new
TableName(SOURCE_TABLE_NAME));
- PipelineDataSourceWrapper targetDataSource = new
PipelineDataSourceWrapper(StorageContainerUtil.generateDataSource(
+ PipelineDataSourceWrapper targetDataSource = new
PipelineDataSourceWrapper(StorageContainerUtils.generateDataSource(
containerComposer.getActualJdbcUrlTemplate(PipelineContainerComposer.DS_4,
false),
containerComposer.getUsername(),
containerComposer.getPassword()), containerComposer.getDatabaseType());
PipelineDataSourceWrapper sourceDataSource = new
PipelineDataSourceWrapper(jdbcDataSource, containerComposer.getDatabaseType());
@@ -168,7 +168,7 @@ class CDCE2EIT {
}
private void startCDCClient(final PipelineContainerComposer
containerComposer) {
- DataSource dataSource =
StorageContainerUtil.generateDataSource(containerComposer.appendExtraParameter(containerComposer.getActualJdbcUrlTemplate(PipelineContainerComposer.DS_4,
false)),
+ DataSource dataSource =
StorageContainerUtils.generateDataSource(containerComposer.appendExtraParameter(containerComposer.getActualJdbcUrlTemplate(PipelineContainerComposer.DS_4,
false)),
containerComposer.getUsername(),
containerComposer.getPassword());
DataSourceRecordConsumer dataSourceRecordConsumer = new
DataSourceRecordConsumer(dataSource, containerComposer.getDatabaseType());
StartCDCClientParameter parameter = new
StartCDCClientParameter(dataSourceRecordConsumer);
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/DataSourceRecordConsumer.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/DataSourceRecordConsumer.java
index 6fcfef5607a..f84e16327f8 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/DataSourceRecordConsumer.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/cdc/DataSourceRecordConsumer.java
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.data.pipeline.cdc.protocol.response.DataRecordR
import
org.apache.shardingsphere.data.pipeline.cdc.protocol.response.TableColumn;
import
org.apache.shardingsphere.data.pipeline.core.metadata.loader.StandardPipelineTableMetaDataLoader;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
-import org.apache.shardingsphere.test.e2e.data.pipeline.util.SQLBuilderUtil;
+import org.apache.shardingsphere.test.e2e.data.pipeline.util.SQLBuilderUtils;
import javax.sql.DataSource;
import java.sql.Connection;
@@ -80,7 +80,7 @@ public final class DataSourceRecordConsumer implements
Consumer<List<Record>> {
PipelineTableMetaData tableMetaData =
loadTableMetaData(metaData.getSchema(), metaData.getTable());
List<String> columnNames =
firstRecord.getAfterList().stream().map(TableColumn::getName).collect(Collectors.toList());
String tableName = buildTableNameWithSchema(metaData.getSchema(),
metaData.getTable());
- String insertSQL = SQLBuilderUtil.buildInsertSQL(columnNames,
tableName);
+ String insertSQL = SQLBuilderUtils.buildInsertSQL(columnNames,
tableName);
try (
Connection connection = dataSource.getConnection();
PreparedStatement preparedStatement =
connection.prepareStatement(insertSQL)) {
@@ -157,11 +157,11 @@ public final class DataSourceRecordConsumer implements
Consumer<List<Record>> {
String tableName = buildTableNameWithSchema(metaData.getSchema(),
metaData.getTable());
switch (record.getDataChangeType()) {
case INSERT:
- return SQLBuilderUtil.buildInsertSQL(columnNames, tableName);
+ return SQLBuilderUtils.buildInsertSQL(columnNames, tableName);
case UPDATE:
- return SQLBuilderUtil.buildUpdateSQL(columnNames, tableName,
"?");
+ return SQLBuilderUtils.buildUpdateSQL(columnNames, tableName,
"?");
case DELETE:
- return SQLBuilderUtil.buildDeleteSQL(tableName, "order_id");
+ return SQLBuilderUtils.buildDeleteSQL(tableName, "order_id");
default:
throw new UnsupportedOperationException();
}
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
index 8a8082fbc70..65534fa7b15 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
@@ -38,7 +38,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.St
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.impl.StorageContainerConfigurationFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.impl.mysql.MySQLContainerConfigurationFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.MySQLContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
@@ -107,7 +107,7 @@ class CreateTableSQLGeneratorIT {
}
private StorageContainerConfiguration
createStorageContainerConfiguration(final DatabaseType databaseType, final
String storageContainerImage) {
- if (DatabaseTypeUtil.isMySQL(databaseType)) {
+ if (DatabaseTypeUtils.isMySQL(databaseType)) {
int majorVersion = new
DockerImageVersion(storageContainerImage).getMajorVersion();
Map<String, String> mountedResources =
Collections.singletonMap(String.format("/env/mysql/mysql%s/my.cnf",
majorVersion), MySQLContainer.MYSQL_CONF_IN_CONTAINER);
return MySQLContainerConfigurationFactory.newInstance(null, null,
mountedResources);
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/AbstractMigrationE2EIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/AbstractMigrationE2EIT.java
index 9f0d4910be7..ac649a80140 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/AbstractMigrationE2EIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/AbstractMigrationE2EIT.java
@@ -25,7 +25,7 @@ import
org.apache.shardingsphere.test.e2e.data.pipeline.cases.PipelineContainerC
import
org.apache.shardingsphere.test.e2e.data.pipeline.command.MigrationDistSQLCommand;
import
org.apache.shardingsphere.test.e2e.data.pipeline.env.PipelineE2EEnvironment;
import
org.apache.shardingsphere.test.e2e.data.pipeline.env.enums.PipelineEnvTypeEnum;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtils;
import org.opengauss.util.PSQLException;
import javax.xml.bind.JAXB;
@@ -77,11 +77,11 @@ public abstract class AbstractMigrationE2EIT {
}
protected void createSourceSchema(final PipelineContainerComposer
containerComposer, final String schemaName) throws SQLException {
- if
(DatabaseTypeUtil.isPostgreSQL(containerComposer.getDatabaseType())) {
+ if
(DatabaseTypeUtils.isPostgreSQL(containerComposer.getDatabaseType())) {
containerComposer.sourceExecuteWithLog(String.format("CREATE
SCHEMA IF NOT EXISTS %s", schemaName));
return;
}
- if (DatabaseTypeUtil.isOpenGauss(containerComposer.getDatabaseType()))
{
+ if
(DatabaseTypeUtils.isOpenGauss(containerComposer.getDatabaseType())) {
try {
containerComposer.sourceExecuteWithLog(String.format("CREATE
SCHEMA %s", schemaName));
} catch (final SQLException ex) {
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/MySQLMigrationGeneralE2EIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/MySQLMigrationGeneralE2EIT.java
index e9fecfd1954..7899cb0f028 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/MySQLMigrationGeneralE2EIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/MySQLMigrationGeneralE2EIT.java
@@ -31,7 +31,7 @@ import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.Pipeline
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineE2ESettings.PipelineE2EDatabaseSettings;
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineE2ETestCaseArgumentsProvider;
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineTestParameter;
-import
org.apache.shardingsphere.test.e2e.data.pipeline.util.DataSourceExecuteUtil;
+import
org.apache.shardingsphere.test.e2e.data.pipeline.util.DataSourceExecuteUtils;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
@@ -68,8 +68,8 @@ class MySQLMigrationGeneralE2EIT extends
AbstractMigrationE2EIT {
createTargetOrderItemTableRule(containerComposer);
Pair<List<Object[]>, List<Object[]>> dataPair =
PipelineCaseHelper.generateFullInsertData(containerComposer.getDatabaseType(),
PipelineContainerComposer.TABLE_INIT_ROW_COUNT);
log.info("init data begin: {}", LocalDateTime.now());
-
DataSourceExecuteUtil.execute(containerComposer.getSourceDataSource(),
containerComposer.getExtraSQLCommand().getFullInsertOrder(SOURCE_TABLE_NAME),
dataPair.getLeft());
-
DataSourceExecuteUtil.execute(containerComposer.getSourceDataSource(),
containerComposer.getExtraSQLCommand().getFullInsertOrderItem(),
dataPair.getRight());
+
DataSourceExecuteUtils.execute(containerComposer.getSourceDataSource(),
containerComposer.getExtraSQLCommand().getFullInsertOrder(SOURCE_TABLE_NAME),
dataPair.getLeft());
+
DataSourceExecuteUtils.execute(containerComposer.getSourceDataSource(),
containerComposer.getExtraSQLCommand().getFullInsertOrderItem(),
dataPair.getRight());
log.info("init data end: {}", LocalDateTime.now());
startMigration(containerComposer, SOURCE_TABLE_NAME,
TARGET_TABLE_NAME);
startMigration(containerComposer, "t_order_item", "t_order_item");
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
index 1c5f18bb194..c2e631a16c0 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/general/PostgreSQLMigrationGeneralE2EIT.java
@@ -32,7 +32,7 @@ import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.Pipeline
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineE2ESettings.PipelineE2EDatabaseSettings;
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineE2ETestCaseArgumentsProvider;
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineTestParameter;
-import
org.apache.shardingsphere.test.e2e.data.pipeline.util.DataSourceExecuteUtil;
+import
org.apache.shardingsphere.test.e2e.data.pipeline.util.DataSourceExecuteUtils;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
@@ -72,8 +72,8 @@ class PostgreSQLMigrationGeneralE2EIT extends
AbstractMigrationE2EIT {
createTargetOrderItemTableRule(containerComposer);
Pair<List<Object[]>, List<Object[]>> dataPair =
PipelineCaseHelper.generateFullInsertData(containerComposer.getDatabaseType(),
PipelineContainerComposer.TABLE_INIT_ROW_COUNT);
log.info("init data begin: {}", LocalDateTime.now());
-
DataSourceExecuteUtil.execute(containerComposer.getSourceDataSource(),
containerComposer.getExtraSQLCommand().getFullInsertOrder(SOURCE_TABLE_NAME),
dataPair.getLeft());
-
DataSourceExecuteUtil.execute(containerComposer.getSourceDataSource(),
containerComposer.getExtraSQLCommand().getFullInsertOrderItem(),
dataPair.getRight());
+
DataSourceExecuteUtils.execute(containerComposer.getSourceDataSource(),
containerComposer.getExtraSQLCommand().getFullInsertOrder(SOURCE_TABLE_NAME),
dataPair.getLeft());
+
DataSourceExecuteUtils.execute(containerComposer.getSourceDataSource(),
containerComposer.getExtraSQLCommand().getFullInsertOrderItem(),
dataPair.getRight());
log.info("init data end: {}", LocalDateTime.now());
startMigrationWithSchema(containerComposer, SOURCE_TABLE_NAME,
"t_order");
Awaitility.await().atMost(10, TimeUnit.SECONDS).pollInterval(1,
TimeUnit.SECONDS).until(() -> listJobId(containerComposer).size() > 0);
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationE2EIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationE2EIT.java
index d946a0016cd..871e5f530c5 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationE2EIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/migration/primarykey/TextPrimaryKeyMigrationE2EIT.java
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.Pipeline
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineE2ESettings.PipelineE2EDatabaseSettings;
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineE2ETestCaseArgumentsProvider;
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.param.PipelineTestParameter;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtils;
import org.junit.jupiter.api.condition.EnabledIf;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ArgumentsSource;
@@ -76,7 +76,7 @@ class TextPrimaryKeyMigrationE2EIT extends
AbstractMigrationE2EIT {
}
private String getSourceTableName(final PipelineContainerComposer
containerComposer) {
- return DatabaseTypeUtil.isMySQL(containerComposer.getDatabaseType()) ?
"T_ORDER" : "t_order";
+ return DatabaseTypeUtils.isMySQL(containerComposer.getDatabaseType())
? "T_ORDER" : "t_order";
}
private static boolean isEnabled() {
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
index e8a67c75c5f..0c48b17f3ed 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/E2EIncrementalTask.java
@@ -26,8 +26,8 @@ import
org.apache.shardingsphere.infra.database.type.dialect.PostgreSQLDatabaseT
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
import
org.apache.shardingsphere.test.e2e.data.pipeline.cases.base.BaseIncrementTask;
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.helper.PipelineCaseHelper;
-import
org.apache.shardingsphere.test.e2e.data.pipeline.util.DataSourceExecuteUtil;
-import org.apache.shardingsphere.test.e2e.data.pipeline.util.SQLBuilderUtil;
+import
org.apache.shardingsphere.test.e2e.data.pipeline.util.DataSourceExecuteUtils;
+import org.apache.shardingsphere.test.e2e.data.pipeline.util.SQLBuilderUtils;
import javax.sql.DataSource;
import java.math.BigDecimal;
@@ -88,32 +88,32 @@ public final class E2EIncrementalTask extends
BaseIncrementTask {
private void insertOrder(final Object[] orderInsertData) {
String sql;
if (databaseType instanceof MySQLDatabaseType) {
- sql = SQLBuilderUtil.buildInsertSQL(MYSQL_COLUMN_NAMES,
orderTableName);
+ sql = SQLBuilderUtils.buildInsertSQL(MYSQL_COLUMN_NAMES,
orderTableName);
} else if (databaseType instanceof PostgreSQLDatabaseType ||
databaseType instanceof OpenGaussDatabaseType) {
- sql = SQLBuilderUtil.buildInsertSQL(POSTGRESQL_COLUMN_NAMES,
orderTableName);
+ sql = SQLBuilderUtils.buildInsertSQL(POSTGRESQL_COLUMN_NAMES,
orderTableName);
} else {
throw new UnsupportedOperationException();
}
- DataSourceExecuteUtil.execute(dataSource, sql, orderInsertData);
+ DataSourceExecuteUtils.execute(dataSource, sql, orderInsertData);
}
private void updateOrderById(final Object orderId) {
ThreadLocalRandom random = ThreadLocalRandom.current();
int randomInt = random.nextInt(-100, 100);
if (databaseType instanceof MySQLDatabaseType) {
- String sql =
SQLBuilderUtil.buildUpdateSQL(ignoreShardingColumns(MYSQL_COLUMN_NAMES),
orderTableName, "?");
+ String sql =
SQLBuilderUtils.buildUpdateSQL(ignoreShardingColumns(MYSQL_COLUMN_NAMES),
orderTableName, "?");
log.info("update sql: {}", sql);
int randomUnsignedInt = random.nextInt(10, 100);
LocalDateTime now = LocalDateTime.now();
- DataSourceExecuteUtil.execute(dataSource, sql, new
Object[]{"中文测试", randomInt, randomInt, randomInt, randomUnsignedInt,
randomUnsignedInt, randomUnsignedInt,
+ DataSourceExecuteUtils.execute(dataSource, sql, new
Object[]{"中文测试", randomInt, randomInt, randomInt, randomUnsignedInt,
randomUnsignedInt, randomUnsignedInt,
randomUnsignedInt, 1.0F, 1.0, new BigDecimal("999"), now,
now, now.toLocalDate(), now.toLocalTime(), Year.now().getValue() + 1, new
byte[]{}, new byte[]{1, 2, -1, -3},
"D".getBytes(), "A".getBytes(), "T".getBytes(), "E",
"text", "mediumText", "3", "3", PipelineCaseHelper.generateJsonString(32,
true), orderId});
return;
}
if (databaseType instanceof PostgreSQLDatabaseType || databaseType
instanceof OpenGaussDatabaseType) {
- String sql =
SQLBuilderUtil.buildUpdateSQL(ignoreShardingColumns(POSTGRESQL_COLUMN_NAMES),
orderTableName, "?");
+ String sql =
SQLBuilderUtils.buildUpdateSQL(ignoreShardingColumns(POSTGRESQL_COLUMN_NAMES),
orderTableName, "?");
log.info("update sql: {}", sql);
- DataSourceExecuteUtil.execute(dataSource, sql, new
Object[]{"中文测试", randomInt, BigDecimal.valueOf(10000), true, new byte[]{},
"char", "varchar", PipelineCaseHelper.generateFloat(),
+ DataSourceExecuteUtils.execute(dataSource, sql, new
Object[]{"中文测试", randomInt, BigDecimal.valueOf(10000), true, new byte[]{},
"char", "varchar", PipelineCaseHelper.generateFloat(),
PipelineCaseHelper.generateDouble(),
PipelineCaseHelper.generateJsonString(10, true),
PipelineCaseHelper.generateJsonString(20, true), "text-update", LocalDate.now(),
LocalTime.now(), Timestamp.valueOf(LocalDateTime.now()),
OffsetDateTime.now(), orderId});
}
@@ -124,14 +124,14 @@ public final class E2EIncrementalTask extends
BaseIncrementTask {
}
private void deleteOrderById(final Object orderId) {
- String sql = SQLBuilderUtil.buildDeleteSQL(orderTableName, "order_id");
- DataSourceExecuteUtil.execute(dataSource, sql, new Object[]{orderId});
+ String sql = SQLBuilderUtils.buildDeleteSQL(orderTableName,
"order_id");
+ DataSourceExecuteUtils.execute(dataSource, sql, new Object[]{orderId});
}
private void setNullToAllFields(final Object orderId) {
if (databaseType instanceof MySQLDatabaseType) {
- String sql =
SQLBuilderUtil.buildUpdateSQL(ignoreShardingColumns(MYSQL_COLUMN_NAMES),
orderTableName, "null");
- DataSourceExecuteUtil.execute(dataSource, sql, new
Object[]{orderId});
+ String sql =
SQLBuilderUtils.buildUpdateSQL(ignoreShardingColumns(MYSQL_COLUMN_NAMES),
orderTableName, "null");
+ DataSourceExecuteUtils.execute(dataSource, sql, new
Object[]{orderId});
}
}
}
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/MySQLIncrementTask.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/MySQLIncrementTask.java
index 23a8c07c588..46c80f15126 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/MySQLIncrementTask.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/MySQLIncrementTask.java
@@ -21,7 +21,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
import
org.apache.shardingsphere.test.e2e.data.pipeline.cases.base.BaseIncrementTask;
-import
org.apache.shardingsphere.test.e2e.data.pipeline.util.DataSourceExecuteUtil;
+import
org.apache.shardingsphere.test.e2e.data.pipeline.util.DataSourceExecuteUtils;
import javax.sql.DataSource;
import java.time.Instant;
@@ -47,7 +47,7 @@ public final class MySQLIncrementTask extends
BaseIncrementTask {
Object orderPrimaryKey = insertOrder();
if (0 == executeCount % 2) {
String sql = String.format("DELETE FROM %s WHERE order_id =
?", orderTableName);
- DataSourceExecuteUtil.execute(dataSource, sql, new
Object[]{orderPrimaryKey});
+ DataSourceExecuteUtils.execute(dataSource, sql, new
Object[]{orderPrimaryKey});
} else {
setNullToOrderFields(orderPrimaryKey);
updateOrderByPrimaryKey(orderPrimaryKey);
@@ -61,13 +61,13 @@ public final class MySQLIncrementTask extends
BaseIncrementTask {
ThreadLocalRandom random = ThreadLocalRandom.current();
Object[] orderInsertDate = new
Object[]{primaryKeyGenerateAlgorithm.generateKey(), random.nextInt(0, 6),
random.nextInt(1, 99), "中文测试"};
- DataSourceExecuteUtil.execute(dataSource, String.format("INSERT INTO
%s (order_id,user_id,t_unsigned_int,status) VALUES (?, ?, ?, ?)",
orderTableName), orderInsertDate);
+ DataSourceExecuteUtils.execute(dataSource, String.format("INSERT INTO
%s (order_id,user_id,t_unsigned_int,status) VALUES (?, ?, ?, ?)",
orderTableName), orderInsertDate);
return orderInsertDate[0];
}
private void updateOrderByPrimaryKey(final Object primaryKey) {
Object[] updateData = {"updated" + Instant.now().getEpochSecond(),
ThreadLocalRandom.current().nextInt(0, 100), primaryKey};
- DataSourceExecuteUtil.execute(dataSource, String.format("UPDATE %s SET
t_char = ?,t_unsigned_int = ? WHERE order_id = ?", orderTableName), updateData);
+ DataSourceExecuteUtils.execute(dataSource, String.format("UPDATE %s
SET t_char = ?,t_unsigned_int = ? WHERE order_id = ?", orderTableName),
updateData);
// TODO 0000-00-00 00:00:00 now will cause consistency check failed.
// jdbcTemplate.update(String.format("UPDATE %s SET t_char =
null,t_unsigned_int = 299,t_datetime='0000-00-00 00:00:00' WHERE order_id = ?",
orderTableName), primaryKey);
/*
@@ -77,6 +77,6 @@ public final class MySQLIncrementTask extends
BaseIncrementTask {
}
private void setNullToOrderFields(final Object primaryKey) {
- DataSourceExecuteUtil.execute(dataSource, String.format("UPDATE %s SET
t_char = null, t_unsigned_int = null WHERE order_id = ?", orderTableName), new
Object[]{primaryKey});
+ DataSourceExecuteUtils.execute(dataSource, String.format("UPDATE %s
SET t_char = null, t_unsigned_int = null WHERE order_id = ?", orderTableName),
new Object[]{primaryKey});
}
}
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/PostgreSQLIncrementTask.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/PostgreSQLIncrementTask.java
index 9eddb1870de..f63298ecd5c 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/PostgreSQLIncrementTask.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/cases/task/PostgreSQLIncrementTask.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.sharding.algorithm.keygen.SnowflakeKeyGenerateA
import org.apache.shardingsphere.sharding.spi.KeyGenerateAlgorithm;
import
org.apache.shardingsphere.test.e2e.data.pipeline.cases.base.BaseIncrementTask;
import
org.apache.shardingsphere.test.e2e.data.pipeline.framework.helper.PipelineCaseHelper;
-import
org.apache.shardingsphere.test.e2e.data.pipeline.util.DataSourceExecuteUtil;
+import
org.apache.shardingsphere.test.e2e.data.pipeline.util.DataSourceExecuteUtils;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
import org.apache.shardingsphere.test.util.PropertiesBuilder.Property;
@@ -57,7 +57,7 @@ public final class PostgreSQLIncrementTask extends
BaseIncrementTask {
while (executeCount < executeCountLimit &&
!Thread.currentThread().isInterrupted()) {
Object orderId = insertOrder();
if (0 == executeCount % 2) {
- DataSourceExecuteUtil.execute(dataSource,
String.format("DELETE FROM %s WHERE order_id = ?",
getTableNameWithSchema(orderTableName)), new Object[]{orderId});
+ DataSourceExecuteUtils.execute(dataSource,
String.format("DELETE FROM %s WHERE order_id = ?",
getTableNameWithSchema(orderTableName)), new Object[]{orderId});
} else {
updateOrderByPrimaryKey(orderId);
}
@@ -72,7 +72,7 @@ public final class PostgreSQLIncrementTask extends
BaseIncrementTask {
PipelineCaseHelper.generateJsonString(10, false)};
String insertSQL = String.format("INSERT INTO %s
(order_id,user_id,status,t_json,t_jsonb) VALUES (?, ?, ?, ?, ?)",
getTableNameWithSchema(orderTableName));
log.info("insert order sql:{}", insertSQL);
- DataSourceExecuteUtil.execute(dataSource, insertSQL, orderInsertDate);
+ DataSourceExecuteUtils.execute(dataSource, insertSQL, orderInsertDate);
return orderInsertDate[0];
}
@@ -80,7 +80,7 @@ public final class PostgreSQLIncrementTask extends
BaseIncrementTask {
// TODO openGauss incremental task parse single quote not correctly now
Object[] updateData = {"中文UPDATE" + Instant.now().getEpochSecond(),
PipelineCaseHelper.generateJsonString(5, true),
PipelineCaseHelper.generateJsonString(5, false), primaryKey};
String updateSql = String.format("UPDATE %s SET status = ?, t_json =
?, t_jsonb = ? WHERE order_id = ?", getTableNameWithSchema(orderTableName));
- DataSourceExecuteUtil.execute(dataSource, updateSql, updateData);
+ DataSourceExecuteUtils.execute(dataSource, updateSql, updateData);
}
private String getTableNameWithSchema(final String tableName) {
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
index ad82bcc7219..962e23b3272 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
@@ -34,7 +34,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.St
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.impl.StorageContainerConfigurationFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.impl.mysql.MySQLContainerConfigurationFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.impl.MySQLContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtils;
import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
import java.security.InvalidParameterException;
@@ -66,7 +66,7 @@ public final class DockerContainerComposer extends
BaseContainerComposer {
}
for (int i = 0; i < storageContainerCount; i++) {
StorageContainerConfiguration storageContainerConfig;
- if (DatabaseTypeUtil.isMySQL(databaseType)) {
+ if (DatabaseTypeUtils.isMySQL(databaseType)) {
int majorVersion = new
DockerImageVersion(storageContainerImage).getMajorVersion();
Map<String, String> mountedResources =
Collections.singletonMap(String.format("/env/mysql/mysql%s/my.cnf",
majorVersion), MySQLContainer.MYSQL_CONF_IN_CONTAINER);
storageContainerConfig =
MySQLContainerConfigurationFactory.newInstance(null, null, mountedResources);
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
index a4cd39c67d6..3d918b4ac7d 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/config/proxy/PipelineProxyClusterContainerConfigurationFactory.java
@@ -23,8 +23,8 @@ import
org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.ProxyClusterContainerConfigurationFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtil;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtils;
import java.util.HashMap;
import java.util.Map;
@@ -43,18 +43,18 @@ public final class
PipelineProxyClusterContainerConfigurationFactory {
* @return created instance
*/
public static AdaptorContainerConfiguration newInstance(final DatabaseType
databaseType, final String storageContainerImage) {
- return new
AdaptorContainerConfiguration(getProxyDatasourceName(databaseType),
getMountedResource(databaseType, storageContainerImage),
AdapterContainerUtil.getAdapterContainerImage());
+ return new
AdaptorContainerConfiguration(getProxyDatasourceName(databaseType),
getMountedResource(databaseType, storageContainerImage),
AdapterContainerUtils.getAdapterContainerImage());
}
private static String getProxyDatasourceName(final DatabaseType
databaseType) {
- return (DatabaseTypeUtil.isPostgreSQL(databaseType) ||
DatabaseTypeUtil.isOpenGauss(databaseType)) ? "postgres" : "";
+ return (DatabaseTypeUtils.isPostgreSQL(databaseType) ||
DatabaseTypeUtils.isOpenGauss(databaseType)) ? "postgres" : "";
}
private static Map<String, String> getMountedResource(final DatabaseType
databaseType, final String storageContainerImage) {
Map<String, String> result = new HashMap<>(2, 1);
result.putAll(ProxyClusterContainerConfigurationFactory.newInstance().getMountedResources());
- if (DatabaseTypeUtil.isMySQL(databaseType)) {
- String majorVersion =
DatabaseTypeUtil.parseMajorVersion(storageContainerImage);
+ if (DatabaseTypeUtils.isMySQL(databaseType)) {
+ String majorVersion =
DatabaseTypeUtils.parseMajorVersion(storageContainerImage);
result.put(String.format("/env/%s/server-%s.yaml",
databaseType.getType().toLowerCase(), majorVersion),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "server.yaml");
} else {
result.put(String.format("/env/%s/server.yaml",
databaseType.getType().toLowerCase()),
ProxyContainerConstants.CONFIG_PATH_IN_CONTAINER + "server.yaml");
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/DataSourceExecuteUtil.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/DataSourceExecuteUtils.java
similarity index 97%
rename from
test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/DataSourceExecuteUtil.java
rename to
test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/DataSourceExecuteUtils.java
index 1947cb670f8..7703c002d4a 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/DataSourceExecuteUtil.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/DataSourceExecuteUtils.java
@@ -27,10 +27,10 @@ import java.sql.SQLException;
import java.util.List;
/**
- * Data source execute util.
+ * Data source execute utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class DataSourceExecuteUtil {
+public final class DataSourceExecuteUtils {
/**
* Execute SQL.
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/SQLBuilderUtil.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/SQLBuilderUtils.java
similarity index 97%
rename from
test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/SQLBuilderUtil.java
rename to
test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/SQLBuilderUtils.java
index b5aa4b943c6..1a23f24b4a6 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/SQLBuilderUtil.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/util/SQLBuilderUtils.java
@@ -23,10 +23,10 @@ import lombok.NoArgsConstructor;
import java.util.List;
/**
- * SQL builder util.
+ * SQL builder utility class.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
-public final class SQLBuilderUtil {
+public final class SQLBuilderUtils {
/**
* Build insert SQL.
diff --git
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
index 1b4ec65ebaa..650e6318d2e 100644
---
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
+++
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
@@ -31,7 +31,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.Govern
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.impl.StorageContainerConfigurationFactory;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtils;
import
org.apache.shardingsphere.test.e2e.showprocesslist.parameter.ShowProcessListTestParameter;
import javax.sql.DataSource;
@@ -57,7 +57,7 @@ public final class ClusterShowProcessListContainerComposer
implements AutoClosea
StorageContainer storageContainer =
containers.registerContainer(StorageContainerFactory.newInstance(testParam.getDatabaseType(),
"", testParam.getScenario(),
StorageContainerConfigurationFactory.newInstance(testParam.getDatabaseType())));
AdaptorContainerConfiguration containerConfig = new
AdaptorContainerConfiguration(testParam.getScenario(),
- getMountedResources(testParam.getScenario(),
testParam.getDatabaseType(), testParam.getRunMode()),
AdapterContainerUtil.getAdapterContainerImage());
+ getMountedResources(testParam.getScenario(),
testParam.getDatabaseType(), testParam.getRunMode()),
AdapterContainerUtils.getAdapterContainerImage());
jdbcContainer = AdapterContainerFactory.newInstance(
AdapterMode.valueOf(testParam.getRunMode().toUpperCase()),
AdapterType.JDBC, testParam.getDatabaseType(), storageContainer,
testParam.getScenario(), containerConfig);
proxyContainer = AdapterContainerFactory.newInstance(
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionContainerComposer.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionContainerComposer.java
index 500c98a8684..dbd48af768e 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionContainerComposer.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionContainerComposer.java
@@ -21,7 +21,7 @@ import lombok.Getter;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.DockerStorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.StorageContainerUtils;
import org.apache.shardingsphere.test.e2e.env.runtime.DataSourceEnvironment;
import
org.apache.shardingsphere.test.e2e.transaction.env.TransactionE2EEnvironment;
import
org.apache.shardingsphere.test.e2e.transaction.env.enums.TransactionE2EEnvTypeEnum;
@@ -77,7 +77,7 @@ public final class TransactionContainerComposer implements
AutoCloseable {
}
private DataSource createDataSource(final DockerStorageContainer
storageContainer, final String dataSourceName) {
- return
StorageContainerUtil.generateDataSource(DataSourceEnvironment.getURL(databaseType,
storageContainer.getHost(), storageContainer.getMappedPort(), dataSourceName),
+ return
StorageContainerUtils.generateDataSource(DataSourceEnvironment.getURL(databaseType,
storageContainer.getHost(), storageContainer.getMappedPort(), dataSourceName),
storageContainer.getUsername(),
storageContainer.getPassword(), 50);
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
index f0b51b6f44a..f35a7135a48 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/config/proxy/ProxyClusterContainerConfigurationFactory.java
@@ -22,8 +22,8 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtil;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtils;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.DatabaseTypeUtils;
import java.util.HashMap;
import java.util.Map;
@@ -42,11 +42,11 @@ public final class
ProxyClusterContainerConfigurationFactory {
* @return created instance
*/
public static AdaptorContainerConfiguration newInstance(final String
scenario, final DatabaseType databaseType) {
- return new
AdaptorContainerConfiguration(getProxyDatasourceName(databaseType),
getMountedResource(scenario, databaseType),
AdapterContainerUtil.getAdapterContainerImage());
+ return new
AdaptorContainerConfiguration(getProxyDatasourceName(databaseType),
getMountedResource(scenario, databaseType),
AdapterContainerUtils.getAdapterContainerImage());
}
private static String getProxyDatasourceName(final DatabaseType
databaseType) {
- return (DatabaseTypeUtil.isPostgreSQL(databaseType) ||
DatabaseTypeUtil.isOpenGauss(databaseType)) ? "postgres" : "";
+ return (DatabaseTypeUtils.isPostgreSQL(databaseType) ||
DatabaseTypeUtils.isOpenGauss(databaseType)) ? "postgres" : "";
}
private static Map<String, String> getMountedResource(final String
scenario, final DatabaseType databaseType) {
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/ClusterContainerComposer.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/ClusterContainerComposer.java
index 530f0411341..c7387203958 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/ClusterContainerComposer.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/ClusterContainerComposer.java
@@ -31,7 +31,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.Govern
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.config.impl.StorageContainerConfigurationFactory;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtils;
import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import javax.sql.DataSource;
@@ -59,7 +59,7 @@ public final class ClusterContainerComposer implements
ContainerComposer {
storageContainer =
containers.registerContainer(StorageContainerFactory.newInstance(testParam.getDatabaseType(),
"", scenario,
StorageContainerConfigurationFactory.newInstance(testParam.getDatabaseType())));
AdaptorContainerConfiguration containerConfig =
ProxyClusterContainerConfigurationFactory.newInstance(
- scenario, testParam.getDatabaseType(),
AdapterContainerUtil.getAdapterContainerImage());
+ scenario, testParam.getDatabaseType(),
AdapterContainerUtils.getAdapterContainerImage());
AdapterContainer adapterContainer =
AdapterContainerFactory.newInstance(AdapterMode.valueOf(testParam.getMode().toUpperCase()),
AdapterType.valueOf(testParam.getAdapter().toUpperCase()),
testParam.getDatabaseType(), storageContainer, scenario, containerConfig);
if (adapterContainer instanceof DockerITContainer) {
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyStandaloneContainerConfigurationFactory.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyStandaloneContainerConfigurationFactory.java
index d95bcf02d9b..e7055a71d44 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyStandaloneContainerConfigurationFactory.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/container/config/ProxyStandaloneContainerConfigurationFactory.java
@@ -22,7 +22,7 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtil;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.util.AdapterContainerUtils;
import java.util.HashMap;
import java.util.Map;
@@ -41,7 +41,7 @@ public final class
ProxyStandaloneContainerConfigurationFactory {
* @return created instance
*/
public static AdaptorContainerConfiguration newInstance(final String
scenario, final DatabaseType databaseType) {
- return new AdaptorContainerConfiguration(scenario,
getMountedResources(scenario, databaseType),
AdapterContainerUtil.getAdapterContainerImage());
+ return new AdaptorContainerConfiguration(scenario,
getMountedResources(scenario, databaseType),
AdapterContainerUtils.getAdapterContainerImage());
}
private static Map<String, String> getMountedResources(final String
scenario, final DatabaseType databaseType) {
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/api/impl/GovernanceRepositoryAPIImplTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/api/impl/GovernanceRepositoryAPIImplTest.java
index ec74d1a9875..7a64a9f8399 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/api/impl/GovernanceRepositoryAPIImplTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/api/impl/GovernanceRepositoryAPIImplTest.java
@@ -40,7 +40,7 @@ import
org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEve
import
org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent.Type;
import
org.apache.shardingsphere.test.it.data.pipeline.core.fixture.FixtureInventoryIncrementalJobItemContext;
import
org.apache.shardingsphere.test.it.data.pipeline.core.util.JobConfigurationBuilder;
-import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtil;
+import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtils;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -67,7 +67,7 @@ class GovernanceRepositoryAPIImplTest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtil.mockModeConfigAndContextManager();
+ PipelineContextUtils.mockModeConfigAndContextManager();
governanceRepositoryAPI =
PipelineAPIFactory.getGovernanceRepositoryAPI();
}
@@ -136,7 +136,7 @@ class GovernanceRepositoryAPIImplTest {
}
private MigrationJobItemContext mockJobItemContext() {
- MigrationJobItemContext result =
PipelineContextUtil.mockMigrationJobItemContext(JobConfigurationBuilder.createJobConfiguration());
+ MigrationJobItemContext result =
PipelineContextUtils.mockMigrationJobItemContext(JobConfigurationBuilder.createJobConfiguration());
MigrationTaskConfiguration taskConfig = result.getTaskConfig();
result.getInventoryTasks().add(mockInventoryTask(taskConfig));
result.getIncrementalTasks().add(mockIncrementalTask(taskConfig));
@@ -148,12 +148,12 @@ class GovernanceRepositoryAPIImplTest {
dumperConfig.setPosition(new PlaceholderPosition());
dumperConfig.setActualTableName("t_order");
dumperConfig.setLogicTableName("t_order");
-
dumperConfig.setUniqueKeyColumns(Collections.singletonList(PipelineContextUtil.mockOrderIdColumnMetaData()));
+
dumperConfig.setUniqueKeyColumns(Collections.singletonList(PipelineContextUtils.mockOrderIdColumnMetaData()));
dumperConfig.setShardingItem(0);
PipelineDataSourceWrapper dataSource =
mock(PipelineDataSourceWrapper.class);
PipelineTableMetaDataLoader metaDataLoader = new
StandardPipelineTableMetaDataLoader(dataSource);
- return new InventoryTask(dumperConfig, taskConfig.getImporterConfig(),
PipelineContextUtil.getPipelineChannelCreator(), mockImporterConnector(),
- dataSource, metaDataLoader,
PipelineContextUtil.getExecuteEngine(), PipelineContextUtil.getExecuteEngine(),
new FixtureInventoryIncrementalJobItemContext());
+ return new InventoryTask(dumperConfig, taskConfig.getImporterConfig(),
PipelineContextUtils.getPipelineChannelCreator(), mockImporterConnector(),
+ dataSource, metaDataLoader,
PipelineContextUtils.getExecuteEngine(),
PipelineContextUtils.getExecuteEngine(), new
FixtureInventoryIncrementalJobItemContext());
}
private ImporterConnector mockImporterConnector() {
@@ -164,7 +164,7 @@ class GovernanceRepositoryAPIImplTest {
DumperConfiguration dumperConfig = taskConfig.getDumperConfig();
dumperConfig.setPosition(new PlaceholderPosition());
PipelineTableMetaDataLoader metaDataLoader = new
StandardPipelineTableMetaDataLoader(mock(PipelineDataSourceWrapper.class));
- return new IncrementalTask(3, dumperConfig,
taskConfig.getImporterConfig(),
PipelineContextUtil.getPipelineChannelCreator(), mockImporterConnector(),
- metaDataLoader, PipelineContextUtil.getExecuteEngine(), new
FixtureInventoryIncrementalJobItemContext());
+ return new IncrementalTask(3, dumperConfig,
taskConfig.getImporterConfig(),
PipelineContextUtils.getPipelineChannelCreator(), mockImporterConnector(),
+ metaDataLoader, PipelineContextUtils.getExecuteEngine(), new
FixtureInventoryIncrementalJobItemContext());
}
}
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistServiceTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistServiceTest.java
index 437d564b2a1..38542beaf0f 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistServiceTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/api/impl/PipelineProcessConfigurationPersistServiceTest.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.data.pipeline.scenario.migration.MigrationJobTy
import org.apache.shardingsphere.data.pipeline.spi.job.JobType;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import
org.apache.shardingsphere.infra.yaml.config.pojo.algorithm.YamlAlgorithmConfiguration;
-import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtil;
+import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtils;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -40,7 +40,7 @@ class PipelineProcessConfigurationPersistServiceTest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtil.mockModeConfigAndContextManager();
+ PipelineContextUtils.mockModeConfigAndContextManager();
}
@Test
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/datasource/DefaultPipelineDataSourceManagerTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/datasource/DefaultPipelineDataSourceManagerTest.java
index 4b547fce94e..df0ff2f9b9f 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/datasource/DefaultPipelineDataSourceManagerTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/datasource/DefaultPipelineDataSourceManagerTest.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.data.pipeline.api.datasource.config.PipelineDat
import
org.apache.shardingsphere.data.pipeline.core.datasource.DefaultPipelineDataSourceManager;
import
org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationJobConfiguration;
import
org.apache.shardingsphere.test.it.data.pipeline.core.util.JobConfigurationBuilder;
-import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtil;
+import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtils;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -44,7 +44,7 @@ class DefaultPipelineDataSourceManagerTest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtil.mockModeConfigAndContextManager();
+ PipelineContextUtils.mockModeConfigAndContextManager();
}
@BeforeEach
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/prepare/InventoryTaskSplitterTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/prepare/InventoryTaskSplitterTest.java
index 0f7c23b8b7d..bfa0ed95b5f 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/prepare/InventoryTaskSplitterTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/prepare/InventoryTaskSplitterTest.java
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.data.pipeline.core.task.InventoryTask;
import
org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationJobConfiguration;
import
org.apache.shardingsphere.data.pipeline.scenario.migration.context.MigrationJobItemContext;
import
org.apache.shardingsphere.test.it.data.pipeline.core.util.JobConfigurationBuilder;
-import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtil;
+import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -60,7 +60,7 @@ class InventoryTaskSplitterTest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtil.mockModeConfigAndContextManager();
+ PipelineContextUtils.mockModeConfigAndContextManager();
}
@BeforeEach
@@ -74,7 +74,7 @@ class InventoryTaskSplitterTest {
private void initJobItemContext() {
MigrationJobConfiguration jobConfig =
JobConfigurationBuilder.createJobConfiguration();
- jobItemContext =
PipelineContextUtil.mockMigrationJobItemContext(jobConfig);
+ jobItemContext =
PipelineContextUtils.mockMigrationJobItemContext(jobConfig);
dataSourceManager = (PipelineDataSourceManager)
jobItemContext.getImporterConnector().getConnector();
}
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/IncrementalTaskTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/IncrementalTaskTest.java
index e7548d30d85..ab11dde895a 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/IncrementalTaskTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/IncrementalTaskTest.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.data.pipeline.scenario.migration.config.Migrati
import
org.apache.shardingsphere.test.it.data.pipeline.core.fixture.FixtureImporterConnector;
import
org.apache.shardingsphere.test.it.data.pipeline.core.fixture.FixtureInventoryIncrementalJobItemContext;
import
org.apache.shardingsphere.test.it.data.pipeline.core.util.JobConfigurationBuilder;
-import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtil;
+import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtils;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -48,16 +48,16 @@ class IncrementalTaskTest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtil.mockModeConfigAndContextManager();
+ PipelineContextUtils.mockModeConfigAndContextManager();
}
@BeforeEach
void setUp() {
- MigrationTaskConfiguration taskConfig =
PipelineContextUtil.mockMigrationJobItemContext(JobConfigurationBuilder.createJobConfiguration()).getTaskConfig();
+ MigrationTaskConfiguration taskConfig =
PipelineContextUtils.mockMigrationJobItemContext(JobConfigurationBuilder.createJobConfiguration()).getTaskConfig();
taskConfig.getDumperConfig().setPosition(new PlaceholderPosition());
PipelineTableMetaDataLoader metaDataLoader = new
StandardPipelineTableMetaDataLoader(mock(PipelineDataSourceWrapper.class));
incrementalTask = new IncrementalTask(3, taskConfig.getDumperConfig(),
taskConfig.getImporterConfig(),
- PipelineContextUtil.getPipelineChannelCreator(), new
FixtureImporterConnector(), metaDataLoader,
PipelineContextUtil.getExecuteEngine(),
+ PipelineContextUtils.getPipelineChannelCreator(), new
FixtureImporterConnector(), metaDataLoader,
PipelineContextUtils.getExecuteEngine(),
new FixtureInventoryIncrementalJobItemContext());
}
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/InventoryTaskTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/InventoryTaskTest.java
index 2ed4d4e0eeb..0de03d0f2fd 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/InventoryTaskTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/task/InventoryTaskTest.java
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.data.pipeline.scenario.migration.config.Migrati
import
org.apache.shardingsphere.test.it.data.pipeline.core.fixture.FixtureImporterConnector;
import
org.apache.shardingsphere.test.it.data.pipeline.core.fixture.FixtureInventoryIncrementalJobItemContext;
import
org.apache.shardingsphere.test.it.data.pipeline.core.util.JobConfigurationBuilder;
-import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtil;
+import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtils;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -57,7 +57,7 @@ class InventoryTaskTest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtil.mockModeConfigAndContextManager();
+ PipelineContextUtils.mockModeConfigAndContextManager();
}
@AfterAll
@@ -67,7 +67,7 @@ class InventoryTaskTest {
@BeforeEach
void setUp() {
- taskConfig =
PipelineContextUtil.mockMigrationJobItemContext(JobConfigurationBuilder.createJobConfiguration()).getTaskConfig();
+ taskConfig =
PipelineContextUtils.mockMigrationJobItemContext(JobConfigurationBuilder.createJobConfiguration()).getTaskConfig();
}
@Test
@@ -77,8 +77,8 @@ class InventoryTaskTest {
PipelineTableMetaDataLoader metaDataLoader = new
StandardPipelineTableMetaDataLoader(dataSource);
try (
InventoryTask inventoryTask = new
InventoryTask(inventoryDumperConfig, taskConfig.getImporterConfig(),
- PipelineContextUtil.getPipelineChannelCreator(), new
FixtureImporterConnector(), dataSource,
- metaDataLoader,
PipelineContextUtil.getExecuteEngine(), PipelineContextUtil.getExecuteEngine(),
new FixtureInventoryIncrementalJobItemContext())) {
+ PipelineContextUtils.getPipelineChannelCreator(), new
FixtureImporterConnector(), dataSource,
+ metaDataLoader,
PipelineContextUtils.getExecuteEngine(),
PipelineContextUtils.getExecuteEngine(), new
FixtureInventoryIncrementalJobItemContext())) {
assertThrows(ExecutionException.class, () ->
CompletableFuture.allOf(inventoryTask.start().toArray(new
CompletableFuture[0])).get(10L, TimeUnit.SECONDS));
}
}
@@ -92,8 +92,8 @@ class InventoryTaskTest {
PipelineTableMetaDataLoader metaDataLoader = new
StandardPipelineTableMetaDataLoader(dataSource);
try (
InventoryTask inventoryTask = new
InventoryTask(inventoryDumperConfig, taskConfig.getImporterConfig(),
- PipelineContextUtil.getPipelineChannelCreator(), new
FixtureImporterConnector(), dataSource,
- metaDataLoader,
PipelineContextUtil.getExecuteEngine(), PipelineContextUtil.getExecuteEngine(),
new FixtureInventoryIncrementalJobItemContext())) {
+ PipelineContextUtils.getPipelineChannelCreator(), new
FixtureImporterConnector(), dataSource,
+ metaDataLoader,
PipelineContextUtils.getExecuteEngine(),
PipelineContextUtils.getExecuteEngine(), new
FixtureInventoryIncrementalJobItemContext())) {
CompletableFuture.allOf(inventoryTask.start().toArray(new
CompletableFuture[0])).get(10L, TimeUnit.SECONDS);
assertThat(inventoryTask.getTaskProgress().getPosition(),
instanceOf(IntegerPrimaryKeyPosition.class));
}
@@ -116,7 +116,7 @@ class InventoryTaskTest {
InventoryDumperConfiguration result = new
InventoryDumperConfiguration(taskConfig.getDumperConfig());
result.setLogicTableName(logicTableName);
result.setActualTableName(actualTableName);
-
result.setUniqueKeyColumns(Collections.singletonList(PipelineContextUtil.mockOrderIdColumnMetaData()));
+
result.setUniqueKeyColumns(Collections.singletonList(PipelineContextUtils.mockOrderIdColumnMetaData()));
result.setPosition(null == taskConfig.getDumperConfig().getPosition()
? new IntegerPrimaryKeyPosition(0, 1000) :
taskConfig.getDumperConfig().getPosition());
return result;
}
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtil.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
similarity index 98%
rename from
test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtil.java
rename to
test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
index 439e9eee316..853608bb903 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtil.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
@@ -57,9 +57,12 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-public final class PipelineContextUtil {
+/**
+ * Pipeline context utility class.
+ */
+public final class PipelineContextUtils {
- private static final ExecuteEngine EXECUTE_ENGINE =
ExecuteEngine.newCachedThreadInstance(PipelineContextUtil.class.getSimpleName());
+ private static final ExecuteEngine EXECUTE_ENGINE =
ExecuteEngine.newCachedThreadInstance(PipelineContextUtils.class.getSimpleName());
private static final PipelineChannelCreator PIPELINE_CHANNEL_CREATOR =
TypedSPILoader.getService(PipelineChannelCreator.class, "MEMORY");
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineDistributedBarrierTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineDistributedBarrierTest.java
index aa3c2f1513b..8ab7ec2d163 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineDistributedBarrierTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineDistributedBarrierTest.java
@@ -36,7 +36,7 @@ class PipelineDistributedBarrierTest {
@BeforeAll
static void setUp() {
- PipelineContextUtil.mockModeConfigAndContextManager();
+ PipelineContextUtils.mockModeConfigAndContextManager();
}
@Test
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobTest.java
index 732c6886c64..0d28631e2cb 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/consistencycheck/ConsistencyCheckJobTest.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.data.pipeline.scenario.consistencycheck.config.
import
org.apache.shardingsphere.data.pipeline.scenario.consistencycheck.context.ConsistencyCheckJobItemContext;
import org.apache.shardingsphere.elasticjob.api.ShardingContext;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
-import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtil;
+import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtils;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.mockito.internal.configuration.plugins.Plugins;
@@ -41,7 +41,7 @@ class ConsistencyCheckJobTest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtil.mockModeConfigAndContextManager();
+ PipelineContextUtils.mockModeConfigAndContextManager();
}
@Test
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/consistencycheck/api/impl/ConsistencyCheckJobAPITest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/consistencycheck/api/impl/ConsistencyCheckJobAPITest.java
index 7a09d38a7f4..ddab19151df 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/consistencycheck/api/impl/ConsistencyCheckJobAPITest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/consistencycheck/api/impl/ConsistencyCheckJobAPITest.java
@@ -32,7 +32,7 @@ import
org.apache.shardingsphere.data.pipeline.scenario.consistencycheck.util.Co
import
org.apache.shardingsphere.data.pipeline.scenario.migration.api.impl.MigrationJobAPI;
import
org.apache.shardingsphere.data.pipeline.scenario.migration.config.MigrationJobConfiguration;
import
org.apache.shardingsphere.test.it.data.pipeline.core.util.JobConfigurationBuilder;
-import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtil;
+import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtils;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -54,7 +54,7 @@ class ConsistencyCheckJobAPITest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtil.mockModeConfigAndContextManager();
+ PipelineContextUtils.mockModeConfigAndContextManager();
checkJobAPI = new ConsistencyCheckJobAPI();
migrationJobAPI = new MigrationJobAPI();
}
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java
index 4407d84e788..0f8cfd4970d 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/api/impl/MigrationJobAPITest.java
@@ -52,7 +52,7 @@ import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import
org.apache.shardingsphere.migration.distsql.statement.MigrateTableStatement;
import
org.apache.shardingsphere.migration.distsql.statement.pojo.SourceTargetEntry;
import
org.apache.shardingsphere.test.it.data.pipeline.core.util.JobConfigurationBuilder;
-import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtil;
+import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtils;
import org.apache.shardingsphere.test.mock.AutoMockExtension;
import org.apache.shardingsphere.test.mock.StaticMockSettings;
import org.junit.jupiter.api.AfterAll;
@@ -95,7 +95,7 @@ class MigrationJobAPITest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtil.mockModeConfigAndContextManager();
+ PipelineContextUtils.mockModeConfigAndContextManager();
jobAPI = new MigrationJobAPI();
String jdbcUrl =
"jdbc:h2:mem:test_ds_0;DB_CLOSE_DELAY=-1;DATABASE_TO_UPPER=false;MODE=MySQL";
databaseType = DatabaseTypeEngine.getDatabaseType(jdbcUrl);
@@ -227,7 +227,7 @@ class MigrationJobAPITest {
final MigrationJobConfiguration jobConfig =
JobConfigurationBuilder.createJobConfiguration();
Optional<String> jobId = jobAPI.start(jobConfig);
assertTrue(jobId.isPresent());
- MigrationJobItemContext jobItemContext =
PipelineContextUtil.mockMigrationJobItemContext(jobConfig);
+ MigrationJobItemContext jobItemContext =
PipelineContextUtils.mockMigrationJobItemContext(jobConfig);
jobAPI.persistJobItemProgress(jobItemContext);
jobAPI.updateJobItemStatus(jobId.get(),
jobItemContext.getShardingItem(), JobStatus.EXECUTE_INVENTORY_TASK);
Map<Integer, InventoryIncrementalJobItemProgress> progress =
jobAPI.getJobProgress(jobConfig);
@@ -260,7 +260,7 @@ class MigrationJobAPITest {
@Test
void assertRenewJobStatus() {
final MigrationJobConfiguration jobConfig =
JobConfigurationBuilder.createJobConfiguration();
- MigrationJobItemContext jobItemContext =
PipelineContextUtil.mockMigrationJobItemContext(jobConfig);
+ MigrationJobItemContext jobItemContext =
PipelineContextUtils.mockMigrationJobItemContext(jobConfig);
jobAPI.persistJobItemProgress(jobItemContext);
jobAPI.updateJobItemStatus(jobConfig.getJobId(), 0,
JobStatus.FINISHED);
Optional<InventoryIncrementalJobItemProgress> actual =
jobAPI.getJobItemProgress(jobItemContext.getJobId(),
jobItemContext.getShardingItem());
diff --git
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyCheckerTest.java
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyCheckerTest.java
index 59d070cd898..02ddd993024 100644
---
a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyCheckerTest.java
+++
b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/scenario/migration/check/consistency/MigrationDataConsistencyCheckerTest.java
@@ -31,7 +31,7 @@ import
org.apache.shardingsphere.elasticjob.infra.pojo.JobConfigurationPOJO;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import
org.apache.shardingsphere.test.it.data.pipeline.core.fixture.DataConsistencyCalculateAlgorithmFixture;
import
org.apache.shardingsphere.test.it.data.pipeline.core.util.JobConfigurationBuilder;
-import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtil;
+import
org.apache.shardingsphere.test.it.data.pipeline.core.util.PipelineContextUtils;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -48,7 +48,7 @@ class MigrationDataConsistencyCheckerTest {
@BeforeAll
static void beforeClass() {
- PipelineContextUtil.mockModeConfigAndContextManager();
+ PipelineContextUtils.mockModeConfigAndContextManager();
}
@Test
@@ -71,7 +71,7 @@ class MigrationDataConsistencyCheckerTest {
}
private MigrationJobConfiguration createJobConfiguration() throws
SQLException {
- MigrationJobItemContext jobItemContext =
PipelineContextUtil.mockMigrationJobItemContext(JobConfigurationBuilder.createJobConfiguration());
+ MigrationJobItemContext jobItemContext =
PipelineContextUtils.mockMigrationJobItemContext(JobConfigurationBuilder.createJobConfiguration());
initTableData(jobItemContext.getTaskConfig().getDumperConfig().getDataSourceConfig());
initTableData(jobItemContext.getTaskConfig().getImporterConfig().getDataSourceConfig());
return jobItemContext.getJobConfig();
