This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 599fa2a1267 Rename StorageContainerOption (#36623)
599fa2a1267 is described below
commit 599fa2a12673c69c263d94661230ca3fb3ee66da
Author: Liang Zhang <[email protected]>
AuthorDate: Fri Sep 19 00:04:53 2025 +0800
Rename StorageContainerOption (#36623)
---
.../test/e2e/agent/engine/env/AgentE2ETestEnvironment.java | 6 +++---
.../storage/mount/MountConfigurationResourceGenerator.java | 4 ++--
.../container/storage/mount/MountSQLResourceGenerator.java | 4 ++--
...rConfigurationOption.java => StorageContainerOption.java} | 4 ++--
...figurationOption.java => HiveStorageContainerOption.java} | 6 +++---
...urationOption.java => MariaDBStorageContainerOption.java} | 6 +++---
...igurationOption.java => MySQLStorageContainerOption.java} | 6 +++---
...ationOption.java => OpenGaussStorageContainerOption.java} | 6 +++---
...tionOption.java => PostgreSQLStorageContainerOption.java} | 6 +++---
.../env/container/storage/type/DockerStorageContainer.java | 8 ++++----
.../env/container/storage/type/NativeStorageContainer.java | 6 +++---
....e2e.env.container.storage.option.StorageContainerOption} | 10 +++++-----
.../cases/createtable/CreateTableSQLGeneratorIT.java | 4 ++--
.../e2e/operation/pipeline/env/PipelineE2EEnvironment.java | 4 ++--
.../compose/docker/PipelineDockerContainerComposer.java | 4 ++--
.../composer/ClusterShowProcessListContainerComposer.java | 4 ++--
.../operation/transaction/env/TransactionE2EEnvironment.java | 12 ++++++------
.../compose/TransactionDockerContainerComposer.java | 4 ++--
.../env/container/compose/mode/ClusterContainerComposer.java | 4 ++--
.../container/compose/mode/StandaloneContainerComposer.java | 4 ++--
20 files changed, 56 insertions(+), 56 deletions(-)
diff --git
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
index 4f084ae1cf6..26aee425587 100644
---
a/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
+++
b/test/e2e/agent/engine/src/test/java/org/apache/shardingsphere/test/e2e/agent/engine/env/AgentE2ETestEnvironment.java
@@ -40,7 +40,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainer
import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainer;
import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption;
import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
import org.awaitility.Awaitility;
import org.testcontainers.containers.output.OutputFrame;
@@ -117,7 +117,7 @@ public final class AgentE2ETestEnvironment {
containers = new ITContainers(null);
ShardingSphereProxyClusterContainer proxyContainer = new
ShardingSphereProxyClusterContainer(databaseType,
getAdaptorContainerConfiguration());
proxyContainer.withLogConsumer(testConfig.isLogEnabled() ?
this::collectLogs : null);
- StorageContainer storageContainer = new
DockerStorageContainer(imageConfig.getMysqlImage(),
DatabaseTypedSPILoader.getService(StorageContainerConfigurationOption.class,
databaseType), null);
+ StorageContainer storageContainer = new
DockerStorageContainer(imageConfig.getMysqlImage(),
DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType),
null);
proxyContainer.dependsOn(storageContainer);
containers.registerContainer(storageContainer);
GovernanceContainer governanceContainer =
GovernanceContainerFactory.newInstance("ZooKeeper");
@@ -148,7 +148,7 @@ public final class AgentE2ETestEnvironment {
private void createJDBCEnvironment(final DockerITContainer
agentPluginContainer) {
containers = new ITContainers(null);
- StorageContainer storageContainer = new
DockerStorageContainer(imageConfig.getMysqlImage(),
DatabaseTypedSPILoader.getService(StorageContainerConfigurationOption.class,
databaseType), null);
+ StorageContainer storageContainer = new
DockerStorageContainer(imageConfig.getMysqlImage(),
DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType),
null);
ShardingSphereJdbcAgentContainer jdbcAgentContainer = new
ShardingSphereJdbcAgentContainer(
imageConfig.getJdbcProjectImage(), testConfig.getPluginType(),
testConfig.isLogEnabled() ? this::collectLogs : null);
jdbcAgentContainer.dependsOn(storageContainer);
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/mount/MountConfigurationResourceGenerator.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/mount/MountConfigurationResourceGenerator.java
index f134aa98e74..a58fcc2b3d4 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/mount/MountConfigurationResourceGenerator.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/mount/MountConfigurationResourceGenerator.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.env.container.storage.mount;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption;
import java.io.File;
import java.util.Collection;
@@ -31,7 +31,7 @@ import java.util.Map;
@RequiredArgsConstructor
public final class MountConfigurationResourceGenerator {
- private final StorageContainerConfigurationOption option;
+ private final StorageContainerOption option;
/**
* Generate mount configuration resource map.
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/mount/MountSQLResourceGenerator.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/mount/MountSQLResourceGenerator.java
index 85351bf99e7..6dbcdfca240 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/mount/MountSQLResourceGenerator.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/mount/MountSQLResourceGenerator.java
@@ -18,7 +18,7 @@
package org.apache.shardingsphere.test.e2e.env.container.storage.mount;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath;
import
org.apache.shardingsphere.test.e2e.env.runtime.scenario.path.ScenarioDataPath.Type;
@@ -44,7 +44,7 @@ public final class MountSQLResourceGenerator {
private static final String TO_BE_MOUNTED_EXPECTED_SCENARIO_SQL_FILE =
"60-scenario-expected-init.sql";
- private final StorageContainerConfigurationOption option;
+ private final StorageContainerOption option;
/**
* Generate mount SQL resource map.
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/StorageContainerConfigurationOption.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/StorageContainerOption.java
similarity index 96%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/StorageContainerConfigurationOption.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/StorageContainerOption.java
index 36afee3f59d..4992ce9e9ca 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/StorageContainerConfigurationOption.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/StorageContainerOption.java
@@ -26,10 +26,10 @@ import java.util.Map;
import java.util.Optional;
/**
- * Storage container configuration option.
+ * Storage container option.
*/
@SingletonSPI
-public interface StorageContainerConfigurationOption extends DatabaseTypedSPI {
+public interface StorageContainerOption extends DatabaseTypedSPI {
/**
* Get container port.
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/HiveStorageContainerConfigurationOption.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/HiveStorageContainerOption.java
similarity index 93%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/HiveStorageContainerConfigurationOption.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/HiveStorageContainerOption.java
index 56f0c284289..301b3dd2092 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/HiveStorageContainerConfigurationOption.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/HiveStorageContainerOption.java
@@ -17,7 +17,7 @@
package
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption;
import java.util.Collection;
import java.util.Collections;
@@ -27,9 +27,9 @@ import java.util.Map;
import java.util.Optional;
/**
- * Storage container configuration option for Hive.
+ * Storage container option for Hive.
*/
-public final class HiveStorageContainerConfigurationOption implements
StorageContainerConfigurationOption {
+public final class HiveStorageContainerOption implements
StorageContainerOption {
@Override
public int getPort() {
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MariaDBStorageContainerConfigurationOption.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MariaDBStorageContainerOption.java
similarity index 92%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MariaDBStorageContainerConfigurationOption.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MariaDBStorageContainerOption.java
index dad42a31661..e95b10316ca 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MariaDBStorageContainerConfigurationOption.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MariaDBStorageContainerOption.java
@@ -17,7 +17,7 @@
package
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption;
import org.apache.shardingsphere.test.e2e.env.container.util.ContainerUtils;
import java.util.Collection;
@@ -28,9 +28,9 @@ import java.util.Map;
import java.util.Optional;
/**
- * Storage container configuration option for MariaDB.
+ * Storage container option for MariaDB.
*/
-public final class MariaDBStorageContainerConfigurationOption implements
StorageContainerConfigurationOption {
+public final class MariaDBStorageContainerOption implements
StorageContainerOption {
@Override
public int getPort() {
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MySQLStorageContainerConfigurationOption.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MySQLStorageContainerOption.java
similarity index 93%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MySQLStorageContainerConfigurationOption.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MySQLStorageContainerOption.java
index a7ab80c0032..f8e3948f573 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MySQLStorageContainerConfigurationOption.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/MySQLStorageContainerOption.java
@@ -17,7 +17,7 @@
package
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption;
import org.apache.shardingsphere.test.e2e.env.container.util.ContainerUtils;
import java.util.Arrays;
@@ -30,9 +30,9 @@ import java.util.Map;
import java.util.Optional;
/**
- * Storage container configuration option for MySQL.
+ * Storage container option for MySQL.
*/
-public final class MySQLStorageContainerConfigurationOption implements
StorageContainerConfigurationOption {
+public final class MySQLStorageContainerOption implements
StorageContainerOption {
@Override
public int getPort() {
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/OpenGaussStorageContainerConfigurationOption.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/OpenGaussStorageContainerOption.java
similarity index 92%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/OpenGaussStorageContainerConfigurationOption.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/OpenGaussStorageContainerOption.java
index 596e486d4e1..f53c539615a 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/OpenGaussStorageContainerConfigurationOption.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/OpenGaussStorageContainerOption.java
@@ -18,7 +18,7 @@
package
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect;
import
org.apache.shardingsphere.test.e2e.env.container.constants.StorageContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption;
import java.util.Arrays;
import java.util.Collection;
@@ -28,9 +28,9 @@ import java.util.Map;
import java.util.Optional;
/**
- * Storage container configuration option for openGauss.
+ * Storage container option for openGauss.
*/
-public final class OpenGaussStorageContainerConfigurationOption implements
StorageContainerConfigurationOption {
+public final class OpenGaussStorageContainerOption implements
StorageContainerOption {
@Override
public int getPort() {
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/PostgreSQLStorageContainerOption.java
similarity index 92%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/PostgreSQLStorageContainerOption.java
index c7142782922..4446ffe4fd8 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/PostgreSQLStorageContainerConfigurationOption.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/option/dialect/PostgreSQLStorageContainerOption.java
@@ -18,7 +18,7 @@
package
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect;
import
org.apache.shardingsphere.test.e2e.env.container.constants.StorageContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption;
import java.util.Collection;
import java.util.Collections;
@@ -28,9 +28,9 @@ import java.util.Map;
import java.util.Optional;
/**
- * Storage container configuration option for PostgreSQL.
+ * Storage container option for PostgreSQL.
*/
-public final class PostgreSQLStorageContainerConfigurationOption implements
StorageContainerConfigurationOption {
+public final class PostgreSQLStorageContainerOption implements
StorageContainerOption {
@Override
public int getPort() {
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/DockerStorageContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/DockerStorageContainer.java
index ae8fe5c80fe..7b279bb0776 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/DockerStorageContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/DockerStorageContainer.java
@@ -29,7 +29,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.constants.StorageContain
import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
import
org.apache.shardingsphere.test.e2e.env.container.storage.mount.MountConfigurationResourceGenerator;
import
org.apache.shardingsphere.test.e2e.env.container.storage.mount.MountSQLResourceGenerator;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption;
import
org.apache.shardingsphere.test.e2e.env.container.util.DockerImageVersion;
import
org.apache.shardingsphere.test.e2e.env.container.util.JdbcConnectCheckingWaitStrategy;
import org.apache.shardingsphere.test.e2e.env.container.util.SQLScriptUtils;
@@ -57,7 +57,7 @@ import java.util.stream.Collectors;
*/
public final class DockerStorageContainer extends DockerITContainer implements
StorageContainer {
- private final StorageContainerConfigurationOption option;
+ private final StorageContainerOption option;
private final String scenario;
@@ -71,7 +71,7 @@ public final class DockerStorageContainer extends
DockerITContainer implements S
@Getter
private final Map<String, DataSource> expectedDataSourceMap = new
LinkedHashMap<>();
- public DockerStorageContainer(final String containerImage, final
StorageContainerConfigurationOption option, final String scenario) {
+ public DockerStorageContainer(final String containerImage, final
StorageContainerOption option, final String scenario) {
super(option.getDatabaseType().toLowerCase(),
getContainerImage(containerImage, option));
this.option = option;
this.scenario = scenario;
@@ -79,7 +79,7 @@ public final class DockerStorageContainer extends
DockerITContainer implements S
dataSourceEnvironment =
DatabaseTypedSPILoader.getService(DataSourceEnvironment.class,
option.getType());
}
- private static String getContainerImage(final String containerImage, final
StorageContainerConfigurationOption option) {
+ private static String getContainerImage(final String containerImage, final
StorageContainerOption option) {
Preconditions.checkNotNull(option, "Can not support database type
`%s`", option.getDatabaseType());
return Strings.isNullOrEmpty(containerImage) ?
option.getDefaultImageName() : containerImage;
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/NativeStorageContainer.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/NativeStorageContainer.java
index ccfbc160b76..8049a0d3798 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/NativeStorageContainer.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/storage/type/NativeStorageContainer.java
@@ -24,7 +24,7 @@ import
org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.constants.StorageContainerConstants;
import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
import
org.apache.shardingsphere.test.e2e.env.container.storage.mount.MountSQLResourceGenerator;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption;
import org.apache.shardingsphere.test.e2e.env.container.util.SQLScriptUtils;
import
org.apache.shardingsphere.test.e2e.env.container.util.StorageContainerUtils;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
@@ -52,7 +52,7 @@ public final class NativeStorageContainer implements
StorageContainer {
private final String scenario;
- private final StorageContainerConfigurationOption option;
+ private final StorageContainerOption option;
@Getter
private final Map<String, DataSource> actualDataSourceMap;
@@ -68,7 +68,7 @@ public final class NativeStorageContainer implements
StorageContainer {
env = E2ETestEnvironment.getInstance();
this.databaseType = databaseType;
this.scenario = scenario;
- option =
DatabaseTypedSPILoader.findService(StorageContainerConfigurationOption.class,
databaseType).orElse(null);
+ option =
DatabaseTypedSPILoader.findService(StorageContainerOption.class,
databaseType).orElse(null);
initDatabase();
actualDataSourceMap = createDataSourceMap(Type.ACTUAL);
expectedDataSourceMap = createDataSourceMap(Type.EXPECTED);
diff --git
a/test/e2e/env/src/test/resources/META-INF/services/org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption
b/test/e2e/env/src/test/resources/META-INF/services/org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption
similarity index 81%
rename from
test/e2e/env/src/test/resources/META-INF/services/org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption
rename to
test/e2e/env/src/test/resources/META-INF/services/org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption
index 0be4040e157..f13a2ca23ea 100644
---
a/test/e2e/env/src/test/resources/META-INF/services/org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption
+++
b/test/e2e/env/src/test/resources/META-INF/services/org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption
@@ -15,8 +15,8 @@
# limitations under the License.
#
-org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.MySQLStorageContainerConfigurationOption
-org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.PostgreSQLStorageContainerConfigurationOption
-org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.MariaDBStorageContainerConfigurationOption
-org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.OpenGaussStorageContainerConfigurationOption
-org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.HiveStorageContainerConfigurationOption
+org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.MySQLStorageContainerOption
+org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.PostgreSQLStorageContainerOption
+org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.MariaDBStorageContainerOption
+org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.OpenGaussStorageContainerOption
+org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.HiveStorageContainerOption
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
index 5236fc8b549..1248c461020 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/cases/createtable/CreateTableSQLGeneratorIT.java
@@ -21,7 +21,7 @@ import
org.apache.shardingsphere.data.pipeline.core.sqlbuilder.dialect.DialectPi
import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption;
import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.entity.CreateTableSQLGeneratorAssertionEntity;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.entity.CreateTableSQLGeneratorAssertionsRootEntity;
@@ -91,7 +91,7 @@ class CreateTableSQLGeneratorIT {
}
private void startStorageContainer(final DatabaseType databaseType, final
String storageContainerImage) {
- storageContainer = new DockerStorageContainer(storageContainerImage,
DatabaseTypedSPILoader.getService(StorageContainerConfigurationOption.class,
databaseType), null);
+ storageContainer = new DockerStorageContainer(storageContainerImage,
DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType),
null);
storageContainer.start();
}
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
index 403f7606c70..39b740616ba 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/env/PipelineE2EEnvironment.java
@@ -23,7 +23,7 @@ import lombok.SneakyThrows;
import
org.apache.shardingsphere.database.connector.core.spi.DatabaseTypedSPILoader;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.constants.StorageContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.env.enums.PipelineEnvTypeEnum;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.env.enums.PipelineProxyTypeEnum;
@@ -71,7 +71,7 @@ public final class PipelineE2EEnvironment {
* @return actual database port
*/
public int getActualDatabasePort(final DatabaseType databaseType) {
- int defaultPort =
DatabaseTypedSPILoader.getService(StorageContainerConfigurationOption.class,
databaseType).getPort();
+ int defaultPort =
DatabaseTypedSPILoader.getService(StorageContainerOption.class,
databaseType).getPort();
return
Integer.parseInt(props.getProperty(String.format("pipeline.it.native.%s.port",
databaseType.getType().toLowerCase()), String.valueOf(defaultPort)));
}
diff --git
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/docker/PipelineDockerContainerComposer.java
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/docker/PipelineDockerContainerComposer.java
index 61fd2b3a59b..5da7fb1ec87 100644
---
a/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/docker/PipelineDockerContainerComposer.java
+++
b/test/e2e/operation/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/operation/pipeline/framework/container/compose/docker/PipelineDockerContainerComposer.java
@@ -26,7 +26,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSph
import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyEmbeddedContainer;
import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainer;
import
org.apache.shardingsphere.test.e2e.env.container.governance.impl.ZookeeperContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption;
import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
import
org.apache.shardingsphere.test.e2e.env.runtime.datasource.DataSourceEnvironment;
import
org.apache.shardingsphere.test.e2e.operation.pipeline.env.PipelineE2EEnvironment;
@@ -58,7 +58,7 @@ public final class PipelineDockerContainerComposer extends
PipelineBaseContainer
GovernanceContainer governanceContainer =
getContainers().registerContainer(new ZookeeperContainer());
for (int i = 0; i < storageContainerCount; i++) {
DockerStorageContainer storageContainer =
getContainers().registerContainer(
- new DockerStorageContainer(storageContainerImage,
DatabaseTypedSPILoader.getService(StorageContainerConfigurationOption.class,
databaseType), null));
+ new DockerStorageContainer(storageContainerImage,
DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType),
null));
storageContainer.setNetworkAliases(Collections.singletonList(String.join(".",
databaseType.getType().toLowerCase() + "_" + i, "host")));
storageContainers.add(storageContainer);
}
diff --git
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
index 5e784508c69..2acdc4b8705 100644
---
a/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
+++
b/test/e2e/operation/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/operation/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainer
import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainer;
import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption;
import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
import
org.apache.shardingsphere.test.e2e.env.container.util.AdapterContainerUtils;
import
org.apache.shardingsphere.test.e2e.operation.showprocesslist.env.ShowProcessListEnvironment;
@@ -58,7 +58,7 @@ public final class ClusterShowProcessListContainerComposer
implements AutoClosea
containers = new ITContainers(testParam.getScenario());
governanceContainer = isClusterMode(testParam.getRunMode()) ?
containers.registerContainer(GovernanceContainerFactory.newInstance("ZooKeeper"))
: null;
StorageContainer storageContainer = containers.registerContainer(
- new DockerStorageContainer("",
DatabaseTypedSPILoader.getService(StorageContainerConfigurationOption.class,
testParam.getDatabaseType()), testParam.getScenario()));
+ new DockerStorageContainer("",
DatabaseTypedSPILoader.getService(StorageContainerOption.class,
testParam.getDatabaseType()), testParam.getScenario()));
AdaptorContainerConfiguration containerConfig = new
AdaptorContainerConfiguration(testParam.getScenario(), new LinkedList<>(),
getMountedResources(testParam.getScenario(),
testParam.getDatabaseType(), testParam.getRunMode(),
testParam.getGovernanceCenter()),
AdapterContainerUtils.getAdapterContainerImage(),
"");
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java
index 94ed791a536..4037bfe2ae9 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/TransactionE2EEnvironment.java
@@ -23,9 +23,9 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainerConstants;
import
org.apache.shardingsphere.test.e2e.env.container.constants.StorageContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.MySQLStorageContainerConfigurationOption;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.OpenGaussStorageContainerConfigurationOption;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.PostgreSQLStorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.MySQLStorageContainerOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.OpenGaussStorageContainerOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.dialect.PostgreSQLStorageContainerOption;
import
org.apache.shardingsphere.test.e2e.operation.transaction.env.enums.TransactionE2EEnvTypeEnum;
import
org.apache.shardingsphere.test.e2e.operation.transaction.env.enums.TransactionTestCaseRegistry;
@@ -113,11 +113,11 @@ public final class TransactionE2EEnvironment {
public int getActualDataSourceDefaultPort(final DatabaseType databaseType)
{
switch (databaseType.getType()) {
case "MySQL":
- return
Integer.parseInt(props.getOrDefault("transaction.it.native.mysql.port", new
MySQLStorageContainerConfigurationOption().getPort()).toString());
+ return
Integer.parseInt(props.getOrDefault("transaction.it.native.mysql.port", new
MySQLStorageContainerOption().getPort()).toString());
case "PostgreSQL":
- return
Integer.parseInt(props.getOrDefault("transaction.it.native.postgresql.port",
new PostgreSQLStorageContainerConfigurationOption().getPort()).toString());
+ return
Integer.parseInt(props.getOrDefault("transaction.it.native.postgresql.port",
new PostgreSQLStorageContainerOption().getPort()).toString());
case "openGauss":
- return
Integer.parseInt(props.getOrDefault("transaction.it.native.opengauss.port", new
OpenGaussStorageContainerConfigurationOption().getPort()).toString());
+ return
Integer.parseInt(props.getOrDefault("transaction.it.native.opengauss.port", new
OpenGaussStorageContainerOption().getPort()).toString());
default:
throw new
UnsupportedOperationException(String.format("Unsupported database type: `%s`",
databaseType.getType()));
}
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/TransactionDockerContainerComposer.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/TransactionDockerContainerComposer.java
index a1bee207485..2417a4b21d5 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/TransactionDockerContainerComposer.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/framework/container/compose/TransactionDockerContainerComposer.java
@@ -33,7 +33,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSph
import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainer;
import
org.apache.shardingsphere.test.e2e.env.container.governance.impl.ZookeeperContainer;
import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption;
import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
import
org.apache.shardingsphere.test.e2e.env.container.storage.type.NativeStorageContainer;
import
org.apache.shardingsphere.test.e2e.operation.transaction.env.TransactionE2EEnvironment;
@@ -64,7 +64,7 @@ public final class TransactionDockerContainerComposer extends
TransactionBaseCon
TransactionE2EEnvTypeEnum envType =
TransactionE2EEnvironment.getInstance().getItEnvType();
if (TransactionE2EEnvTypeEnum.DOCKER == envType) {
storageContainer = getContainers().registerContainer(new
DockerStorageContainer(
- testParam.getStorageContainerImage(),
DatabaseTypedSPILoader.getService(StorageContainerConfigurationOption.class,
databaseType), testParam.getScenario()));
+ testParam.getStorageContainerImage(),
DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType),
testParam.getScenario()));
} else {
storageContainer = getContainers().registerContainer(new
NativeStorageContainer(databaseType, testParam.getScenario()));
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
index 035dc1221a2..9e76ae1f298 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/ClusterContainerComposer.java
@@ -30,7 +30,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSph
import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainer;
import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption;
import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
import
org.apache.shardingsphere.test.e2e.env.container.storage.type.NativeStorageContainer;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
@@ -61,7 +61,7 @@ public final class ClusterContainerComposer implements
ContainerComposer {
Type envType =
E2ETestEnvironment.getInstance().getClusterEnvironment().getType();
storageContainer = containers.registerContainer(Type.DOCKER == envType
? new
DockerStorageContainer(E2ETestEnvironment.getInstance().getClusterEnvironment().getDatabaseImages().get(databaseType),
-
DatabaseTypedSPILoader.getService(StorageContainerConfigurationOption.class,
databaseType), scenario)
+
DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType),
scenario)
: new NativeStorageContainer(databaseType, scenario));
AdaptorContainerConfiguration containerConfig =
SQLE2EProxyContainerConfigurationFactory.newInstance(scenario, "cluster",
databaseType);
AdapterContainer adapterContainer =
AdapterContainerFactory.newInstance(adapterMode, adapterType, databaseType,
scenario, containerConfig, storageContainer, envType.name());
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
index 5cad89fa0dd..65392fef788 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/mode/StandaloneContainerComposer.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorCo
import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConfigurationOption;
+import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerOption;
import
org.apache.shardingsphere.test.e2e.env.container.storage.type.DockerStorageContainer;
import
org.apache.shardingsphere.test.e2e.env.container.storage.type.NativeStorageContainer;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
@@ -54,7 +54,7 @@ public final class StandaloneContainerComposer implements
ContainerComposer {
Type envType =
E2ETestEnvironment.getInstance().getClusterEnvironment().getType();
storageContainer = containers.registerContainer(Type.DOCKER == envType
? new
DockerStorageContainer(E2ETestEnvironment.getInstance().getClusterEnvironment().getDatabaseImages().get(databaseType),
-
DatabaseTypedSPILoader.getService(StorageContainerConfigurationOption.class,
databaseType), scenario)
+
DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType),
scenario)
: new NativeStorageContainer(databaseType, scenario));
AdaptorContainerConfiguration containerConfig =
SQLE2EProxyContainerConfigurationFactory.newInstance(scenario, "standalone",
databaseType);
AdapterContainer adapterContainer =
AdapterContainerFactory.newInstance(adapterMode, adapterType, databaseType,
scenario, containerConfig, storageContainer, envType.name());
