This is an automated email from the ASF dual-hosted git repository.
sunnianjun 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 ec1dbc16e98 Refactor AdapterModeEnum and AdapterType (#23697)
ec1dbc16e98 is described below
commit ec1dbc16e98ff87b87f021c27d89868d443f1690
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Jan 22 01:15:40 2023 +0800
Refactor AdapterModeEnum and AdapterType (#23697)
* Remove useless param in ExecuteProcessEngine
* Refactor AdapterModeEnum and AdapterType
---
.../container/compose/DockerContainerComposer.java | 8 ++++----
.../atomic/adapter/AdapterContainerFactory.java | 18 +++++++++++-------
.../enums/{AdapterModeEnum.java => AdapterMode.java} | 4 ++--
.../{AdapterContainerEnum.java => AdapterType.java} | 4 ++--
.../container/compose/DockerContainerComposer.java | 8 ++++----
.../ClusterShowProcessListContainerComposer.java | 8 ++++++--
.../container/compose/ContainerComposerRegistry.java | 6 +++---
.../compose/mode/ClusterContainerComposer.java | 6 ++++--
.../compose/mode/StandaloneContainerComposer.java | 5 ++++-
.../test/e2e/engine/TotalSuitesCountCalculator.java | 8 ++++----
.../array/ClusterTestParameterArrayGenerator.java | 6 +++---
.../framework/param/array/E2ETestParameterFactory.java | 10 +++++-----
.../array/JdbcStandaloneTestParameterGenerator.java | 10 +++++-----
.../array/ProxyStandaloneTestParameterGenerator.java | 6 +++---
.../test/e2e/transaction/engine/base/BaseE2EIT.java | 6 +++---
.../transaction/engine/base/TransactionBaseE2EIT.java | 4 ++--
.../env/enums/TransactionTestCaseRegistry.java | 14 +++++++-------
.../container/compose/DockerContainerComposer.java | 8 ++++----
18 files changed, 76 insertions(+), 63 deletions(-)
diff --git
a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/compose/DockerContainerComposer.java
b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/compose/DockerContainerComposer.java
index 415da898921..c25203f8068 100644
---
a/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/compose/DockerContainerComposer.java
+++
b/test/e2e/discovery/src/test/java/org/apache/shardingsphere/test/e2e/discovery/framework/container/compose/DockerContainerComposer.java
@@ -27,8 +27,8 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.Ad
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyClusterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.ProxyContainerConstants;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.constants.StorageContainerConstants;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterContainerEnum;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterModeEnum;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.impl.ZookeeperContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.DockerStorageContainer;
@@ -73,8 +73,8 @@ public final class DockerContainerComposer extends
BaseContainerComposer {
storageContainers.add(storageContainer);
});
AdaptorContainerConfiguration containerConfig =
ProxyClusterContainerConfigurationFactory.newInstance(scenario);
- ShardingSphereProxyClusterContainer proxyClusterContainer =
(ShardingSphereProxyClusterContainer) AdapterContainerFactory
- .newInstance(AdapterModeEnum.CLUSTER.getValue(),
AdapterContainerEnum.PROXY.getValue(), databaseType, null, "", containerConfig);
+ ShardingSphereProxyClusterContainer proxyClusterContainer =
(ShardingSphereProxyClusterContainer) AdapterContainerFactory.newInstance(
+ AdapterMode.CLUSTER, AdapterType.PROXY, databaseType, null,
"", containerConfig);
storageContainers.forEach(each ->
proxyClusterContainer.dependsOn(governanceContainer, each));
proxyContainer =
getContainers().registerContainer(proxyClusterContainer);
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/AdapterContainerFactory.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/AdapterContainerFactory.java
index 254218f3d1d..89bcf1a7ad7 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/AdapterContainerFactory.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/adapter/AdapterContainerFactory.java
@@ -24,6 +24,8 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.Ad
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereJdbcContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyClusterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyStandaloneContainer;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
/**
@@ -35,23 +37,25 @@ public final class AdapterContainerFactory {
/**
* Create new instance of adapter container.
*
- * @param mode mode
- * @param adapter adapter
+ * @param mode adapter mode
+ * @param adapter adapter type
* @param databaseType database type
* @param storageContainer storage container
* @param scenario scenario
* @param containerConfig adaptor container configuration
* @return created instance
*/
- public static AdapterContainer newInstance(final String mode, final String
adapter, final DatabaseType databaseType,
+ public static AdapterContainer newInstance(final AdapterMode mode, final
AdapterType adapter, final DatabaseType databaseType,
final StorageContainer
storageContainer, final String scenario, final AdaptorContainerConfiguration
containerConfig) {
switch (adapter) {
- case "proxy":
- return "Cluster".equals(mode) ? new
ShardingSphereProxyClusterContainer(databaseType, containerConfig) : new
ShardingSphereProxyStandaloneContainer(databaseType, containerConfig);
- case "jdbc":
+ case PROXY:
+ return AdapterMode.CLUSTER == mode
+ ? new
ShardingSphereProxyClusterContainer(databaseType, containerConfig)
+ : new
ShardingSphereProxyStandaloneContainer(databaseType, containerConfig);
+ case JDBC:
return new ShardingSphereJdbcContainer(storageContainer,
scenario);
default:
- throw new RuntimeException(String.format("Adapter [%s] is
unknown.", adapter));
+ throw new RuntimeException(String.format("Unknown adapter
`%s`.", adapter));
}
}
}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/enums/AdapterModeEnum.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/enums/AdapterMode.java
similarity index 95%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/enums/AdapterModeEnum.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/enums/AdapterMode.java
index 5aa100c9461..7c10260951f 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/enums/AdapterModeEnum.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/enums/AdapterMode.java
@@ -21,11 +21,11 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
- * Adapter mode type.
+ * Adapter mode.
*/
@RequiredArgsConstructor
@Getter
-public enum AdapterModeEnum {
+public enum AdapterMode {
STANDALONE("Standalone"),
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/enums/AdapterContainerEnum.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/enums/AdapterType.java
similarity index 94%
rename from
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/enums/AdapterContainerEnum.java
rename to
test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/enums/AdapterType.java
index 7941d8c1937..2c5ca7552f0 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/enums/AdapterContainerEnum.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/atomic/enums/AdapterType.java
@@ -21,11 +21,11 @@ import lombok.Getter;
import lombok.RequiredArgsConstructor;
/**
- * Adapter container type.
+ * Adapter type.
*/
@RequiredArgsConstructor
@Getter
-public enum AdapterContainerEnum {
+public enum AdapterType {
JDBC("jdbc"),
diff --git
a/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
b/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
index 51e6c867f7a..e5c14661cff 100644
---
a/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
+++
b/test/e2e/pipeline/src/test/java/org/apache/shardingsphere/test/e2e/data/pipeline/framework/container/compose/DockerContainerComposer.java
@@ -24,8 +24,8 @@ import
org.apache.shardingsphere.test.e2e.data.pipeline.util.DockerImageVersion;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyClusterContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterContainerEnum;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterModeEnum;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.impl.ZookeeperContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.DockerStorageContainer;
@@ -79,8 +79,8 @@ public final class DockerContainerComposer extends
BaseContainerComposer {
storageContainers.add(storageContainer);
}
AdaptorContainerConfiguration containerConfig =
PipelineProxyClusterContainerConfigurationFactory.newInstance(databaseType,
storageContainerImage);
- ShardingSphereProxyClusterContainer proxyClusterContainer =
(ShardingSphereProxyClusterContainer)
AdapterContainerFactory.newInstance(AdapterModeEnum.CLUSTER.getValue(),
- AdapterContainerEnum.PROXY.getValue(), databaseType, null, "",
containerConfig);
+ ShardingSphereProxyClusterContainer proxyClusterContainer =
(ShardingSphereProxyClusterContainer) AdapterContainerFactory.newInstance(
+ AdapterMode.CLUSTER, AdapterType.PROXY, databaseType, null,
"", containerConfig);
for (DockerStorageContainer each : storageContainers) {
proxyClusterContainer.dependsOn(governanceContainer, each);
}
diff --git
a/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
b/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
index 433fda24392..528a14bf68b 100644
---
a/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
+++
b/test/e2e/showprocesslist/src/test/java/org/apache/shardingsphere/test/e2e/showprocesslist/container/composer/ClusterShowProcessListContainerComposer.java
@@ -24,6 +24,8 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterCo
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainerFactory;
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.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
@@ -56,8 +58,10 @@ public final class ClusterShowProcessListContainerComposer {
StorageContainerConfigurationFactory.newInstance(testParam.getDatabaseType())));
AdaptorContainerConfiguration containerConfig = new
AdaptorContainerConfiguration(testParam.getScenario(),
getMountedResources(testParam.getScenario(),
testParam.getDatabaseType(), testParam.getRunMode()),
AdapterContainerUtil.getAdapterContainerImage());
- jdbcContainer =
AdapterContainerFactory.newInstance(testParam.getRunMode(), "jdbc",
testParam.getDatabaseType(), storageContainer, testParam.getScenario(),
containerConfig);
- proxyContainer =
AdapterContainerFactory.newInstance(testParam.getRunMode(), "proxy",
testParam.getDatabaseType(), storageContainer, testParam.getScenario(),
containerConfig);
+ jdbcContainer = AdapterContainerFactory.newInstance(
+ AdapterMode.valueOf(testParam.getRunMode().toUpperCase()),
AdapterType.JDBC, testParam.getDatabaseType(), storageContainer,
testParam.getScenario(), containerConfig);
+ proxyContainer = AdapterContainerFactory.newInstance(
+ AdapterMode.valueOf(testParam.getRunMode().toUpperCase()),
AdapterType.PROXY, testParam.getDatabaseType(), storageContainer,
testParam.getScenario(), containerConfig);
if (proxyContainer instanceof DockerITContainer) {
if (isClusterMode(testParam.getRunMode())) {
((DockerITContainer)
proxyContainer).dependsOn(governanceContainer);
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/ContainerComposerRegistry.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/ContainerComposerRegistry.java
index b0ba080c6b2..fc4158b203e 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/ContainerComposerRegistry.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/ContainerComposerRegistry.java
@@ -21,8 +21,8 @@ import com.google.common.base.Preconditions;
import lombok.SneakyThrows;
import
org.apache.shardingsphere.test.e2e.container.compose.mode.ClusterContainerComposer;
import
org.apache.shardingsphere.test.e2e.container.compose.mode.StandaloneContainerComposer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterContainerEnum;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterModeEnum;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
import javax.sql.DataSource;
@@ -61,7 +61,7 @@ public final class ContainerComposerRegistry implements
AutoCloseable {
private boolean isClusterMode(final E2ETestParameter testParam) {
// TODO cluster mode often throw exception sometimes, issue is #15517
- return
AdapterModeEnum.CLUSTER.getValue().equalsIgnoreCase(testParam.getMode()) &&
AdapterContainerEnum.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter());
+ return
AdapterMode.CLUSTER.getValue().equalsIgnoreCase(testParam.getMode()) &&
AdapterType.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter());
}
@Override
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/ClusterContainerComposer.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/ClusterContainerComposer.java
index 2c9f02ae920..530f0411341 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/ClusterContainerComposer.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/ClusterContainerComposer.java
@@ -24,6 +24,8 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.ITContainers;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.config.AdaptorContainerConfiguration;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.StorageContainer;
@@ -58,8 +60,8 @@ public final class ClusterContainerComposer implements
ContainerComposer {
StorageContainerConfigurationFactory.newInstance(testParam.getDatabaseType())));
AdaptorContainerConfiguration containerConfig =
ProxyClusterContainerConfigurationFactory.newInstance(
scenario, testParam.getDatabaseType(),
AdapterContainerUtil.getAdapterContainerImage());
- AdapterContainer adapterContainer =
AdapterContainerFactory.newInstance(
- testParam.getMode(), testParam.getAdapter(),
testParam.getDatabaseType(), storageContainer, scenario, containerConfig);
+ AdapterContainer adapterContainer =
AdapterContainerFactory.newInstance(AdapterMode.valueOf(testParam.getMode().toUpperCase()),
+ AdapterType.valueOf(testParam.getAdapter().toUpperCase()),
testParam.getDatabaseType(), storageContainer, scenario, containerConfig);
if (adapterContainer instanceof DockerITContainer) {
((DockerITContainer)
adapterContainer).dependsOn(governanceContainer, storageContainer);
}
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/StandaloneContainerComposer.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/StandaloneContainerComposer.java
index c3df40b071d..4d0e56d3416 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/StandaloneContainerComposer.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/container/compose/mode/StandaloneContainerComposer.java
@@ -23,6 +23,8 @@ import
org.apache.shardingsphere.test.e2e.env.container.atomic.DockerITContainer
import org.apache.shardingsphere.test.e2e.env.container.atomic.ITContainers;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainerFactory;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
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;
@@ -48,7 +50,8 @@ public final class StandaloneContainerComposer implements
ContainerComposer {
// TODO add more version of databases
storageContainer =
containers.registerContainer(StorageContainerFactory.newInstance(testParam.getDatabaseType(),
"", scenario,
StorageContainerConfigurationFactory.newInstance(testParam.getDatabaseType())));
- adapterContainer =
containers.registerContainer(AdapterContainerFactory.newInstance(testParam.getMode(),
testParam.getAdapter(),
+ adapterContainer =
containers.registerContainer(AdapterContainerFactory.newInstance(AdapterMode.valueOf(testParam.getMode().toUpperCase()),
+ AdapterType.valueOf(testParam.getAdapter().toUpperCase()),
testParam.getDatabaseType(), storageContainer, scenario,
ProxyStandaloneContainerConfigurationFactory.newInstance(scenario,
testParam.getDatabaseType())));
if (adapterContainer instanceof DockerITContainer) {
((DockerITContainer) adapterContainer).dependsOn(storageContainer);
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/TotalSuitesCountCalculator.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/TotalSuitesCountCalculator.java
index 0065aeacb52..5a98093fc86 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/TotalSuitesCountCalculator.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/engine/TotalSuitesCountCalculator.java
@@ -19,8 +19,8 @@ package org.apache.shardingsphere.test.e2e.engine;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterContainerEnum;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterModeEnum;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
/**
@@ -62,10 +62,10 @@ public final class TotalSuitesCountCalculator {
}
private static boolean isRunDCL() {
- return ENV.getRunModes().contains(AdapterModeEnum.CLUSTER.getValue());
+ return ENV.getRunModes().contains(AdapterMode.CLUSTER.getValue());
}
private static boolean isRunProxy() {
- return ENV.getRunModes().contains(AdapterModeEnum.CLUSTER.getValue())
&&
ENV.getClusterEnvironment().getAdapters().contains(AdapterContainerEnum.PROXY.getValue());
+ return ENV.getRunModes().contains(AdapterMode.CLUSTER.getValue()) &&
ENV.getClusterEnvironment().getAdapters().contains(AdapterType.PROXY.getValue());
}
}
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
index 6fae4d395df..222c7dfc1d0 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ClusterTestParameterArrayGenerator.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.test.e2e.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterModeEnum;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
@@ -42,7 +42,7 @@ public final class ClusterTestParameterArrayGenerator {
* @return assertion test parameter
*/
public static Collection<AssertionTestParameter>
getAssertionTestParameter(final SQLCommandType sqlCommandType) {
- return new
E2ETestParameterGenerator(ENV.getClusterEnvironment().getAdapters(),
ENV.getScenarios(), AdapterModeEnum.CLUSTER.getValue(),
+ return new
E2ETestParameterGenerator(ENV.getClusterEnvironment().getAdapters(),
ENV.getScenarios(), AdapterMode.CLUSTER.getValue(),
ENV.getClusterEnvironment().getDatabaseTypes()).getAssertionTestParameter(sqlCommandType);
}
@@ -53,7 +53,7 @@ public final class ClusterTestParameterArrayGenerator {
* @return case parameter
*/
public static Collection<E2ETestParameter> getCaseTestParameter(final
SQLCommandType sqlCommandType) {
- return new
E2ETestParameterGenerator(ENV.getClusterEnvironment().getAdapters(),
ENV.getScenarios(), AdapterModeEnum.CLUSTER.getValue(),
+ return new
E2ETestParameterGenerator(ENV.getClusterEnvironment().getAdapters(),
ENV.getScenarios(), AdapterMode.CLUSTER.getValue(),
ENV.getClusterEnvironment().getDatabaseTypes()).getCaseTestParameter(sqlCommandType);
}
}
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
index 6b90a168045..c85b30e10b6 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/E2ETestParameterFactory.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.test.e2e.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterModeEnum;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
@@ -45,11 +45,11 @@ public final class E2ETestParameterFactory {
public static Collection<AssertionTestParameter>
getAssertionTestParameters(final SQLCommandType sqlCommandType) {
Collection<AssertionTestParameter> result = new LinkedList<>();
for (String each : ENV.getRunModes()) {
- if (AdapterModeEnum.STANDALONE.getValue().equalsIgnoreCase(each)) {
+ if (AdapterMode.STANDALONE.getValue().equalsIgnoreCase(each)) {
result.addAll(isDistSQLCommandType(sqlCommandType)
?
ProxyStandaloneTestParameterGenerator.getAssertionTestParameter(sqlCommandType)
:
JdbcStandaloneTestParameterGenerator.getAssertionTestParameter(sqlCommandType));
- } else if
(AdapterModeEnum.CLUSTER.getValue().equalsIgnoreCase(each)) {
+ } else if (AdapterMode.CLUSTER.getValue().equalsIgnoreCase(each)) {
result.addAll(ClusterTestParameterArrayGenerator.getAssertionTestParameter(sqlCommandType));
}
}
@@ -65,11 +65,11 @@ public final class E2ETestParameterFactory {
public static Collection<E2ETestParameter> getCaseTestParameters(final
SQLCommandType sqlCommandType) {
Collection<E2ETestParameter> result = new LinkedList<>();
for (String each : ENV.getRunModes()) {
- if (AdapterModeEnum.STANDALONE.getValue().equalsIgnoreCase(each)) {
+ if (AdapterMode.STANDALONE.getValue().equalsIgnoreCase(each)) {
result.addAll(isDistSQLCommandType(sqlCommandType)
?
ProxyStandaloneTestParameterGenerator.getCaseTestParameter(sqlCommandType)
:
JdbcStandaloneTestParameterGenerator.getCaseTestParameter(sqlCommandType));
- } else if
(AdapterModeEnum.CLUSTER.getValue().equalsIgnoreCase(each)) {
+ } else if (AdapterMode.CLUSTER.getValue().equalsIgnoreCase(each)) {
result.addAll(ClusterTestParameterArrayGenerator.getCaseTestParameter(sqlCommandType));
}
}
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
index 4c6da41322e..0abbf545cac 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/JdbcStandaloneTestParameterGenerator.java
@@ -22,8 +22,8 @@ import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import org.apache.shardingsphere.infra.util.spi.type.typed.TypedSPIRegistry;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterContainerEnum;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterModeEnum;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
@@ -37,7 +37,7 @@ import java.util.Collections;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class JdbcStandaloneTestParameterGenerator {
- private static final Collection<String> ADAPTERS =
Collections.singleton(AdapterContainerEnum.JDBC.getValue());
+ private static final Collection<String> ADAPTERS =
Collections.singleton(AdapterType.JDBC.getValue());
private static final Collection<DatabaseType> DATABASE_TYPES =
Collections.singleton(TypedSPIRegistry.getRegisteredService(DatabaseType.class,
"H2"));
@@ -50,7 +50,7 @@ public final class JdbcStandaloneTestParameterGenerator {
* @return assertion test parameter
*/
public static Collection<AssertionTestParameter>
getAssertionTestParameter(final SQLCommandType sqlCommandType) {
- return new E2ETestParameterGenerator(ADAPTERS, ENV.getScenarios(),
AdapterModeEnum.STANDALONE.getValue(),
DATABASE_TYPES).getAssertionTestParameter(sqlCommandType);
+ return new E2ETestParameterGenerator(ADAPTERS, ENV.getScenarios(),
AdapterMode.STANDALONE.getValue(),
DATABASE_TYPES).getAssertionTestParameter(sqlCommandType);
}
/**
@@ -60,6 +60,6 @@ public final class JdbcStandaloneTestParameterGenerator {
* @return case test parameter
*/
public static Collection<E2ETestParameter> getCaseTestParameter(final
SQLCommandType sqlCommandType) {
- return new E2ETestParameterGenerator(ADAPTERS, ENV.getScenarios(),
AdapterModeEnum.STANDALONE.getValue(),
DATABASE_TYPES).getCaseTestParameter(sqlCommandType);
+ return new E2ETestParameterGenerator(ADAPTERS, ENV.getScenarios(),
AdapterMode.STANDALONE.getValue(),
DATABASE_TYPES).getCaseTestParameter(sqlCommandType);
}
}
diff --git
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
index e9ba806851d..a2424b29b38 100644
---
a/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
+++
b/test/e2e/suite/src/test/java/org/apache/shardingsphere/test/e2e/framework/param/array/ProxyStandaloneTestParameterGenerator.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.test.e2e.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.test.e2e.cases.SQLCommandType;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterModeEnum;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.runtime.IntegrationTestEnvironment;
import
org.apache.shardingsphere.test.e2e.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.framework.param.model.E2ETestParameter;
@@ -43,7 +43,7 @@ public final class ProxyStandaloneTestParameterGenerator {
*/
public static Collection<AssertionTestParameter>
getAssertionTestParameter(final SQLCommandType sqlCommandType) {
return new
E2ETestParameterGenerator(ENV.getClusterEnvironment().getAdapters(),
- ENV.getScenarios(), AdapterModeEnum.STANDALONE.getValue(),
ENV.getClusterEnvironment().getDatabaseTypes()).getAssertionTestParameter(sqlCommandType);
+ ENV.getScenarios(), AdapterMode.STANDALONE.getValue(),
ENV.getClusterEnvironment().getDatabaseTypes()).getAssertionTestParameter(sqlCommandType);
}
/**
@@ -54,6 +54,6 @@ public final class ProxyStandaloneTestParameterGenerator {
*/
public static Collection<E2ETestParameter> getCaseTestParameter(final
SQLCommandType sqlCommandType) {
return new
E2ETestParameterGenerator(ENV.getClusterEnvironment().getAdapters(),
- ENV.getScenarios(), AdapterModeEnum.STANDALONE.getValue(),
ENV.getClusterEnvironment().getDatabaseTypes()).getCaseTestParameter(sqlCommandType);
+ ENV.getScenarios(), AdapterMode.STANDALONE.getValue(),
ENV.getClusterEnvironment().getDatabaseTypes()).getCaseTestParameter(sqlCommandType);
}
}
diff --git
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/BaseE2EIT.java
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/BaseE2EIT.java
index 55d6e802991..0af840c8752 100644
---
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/BaseE2EIT.java
+++
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/BaseE2EIT.java
@@ -27,7 +27,7 @@ import
org.apache.shardingsphere.infra.database.type.DatabaseType;
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;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterContainerEnum;
+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.runtime.DataSourceEnvironment;
@@ -122,7 +122,7 @@ public abstract class BaseE2EIT {
}
final boolean isProxyAdapter(final TransactionTestParameter testParam) {
- return
AdapterContainerEnum.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter());
+ return
AdapterType.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter());
}
private ProxyDataSource createProxyDataSource() {
@@ -205,7 +205,7 @@ public abstract class BaseE2EIT {
private static void addParametersByTransactionTypes(final String version,
final TransactionTestCaseRegistry currentTestCaseInfo,
final Class<? extends
BaseTransactionTestCase> caseClass, final TransactionTestCase annotation,
final Map<String,
TransactionTestParameter> testParams, final String scenario) {
- if
(AdapterContainerEnum.PROXY.getValue().equals(currentTestCaseInfo.getRunningAdaptor()))
{
+ if
(AdapterType.PROXY.getValue().equals(currentTestCaseInfo.getRunningAdaptor())) {
List<TransactionType> allowTransactionTypes =
ENV.getAllowTransactionTypes().isEmpty() ?
Arrays.stream(TransactionType.values()).collect(Collectors.toList())
:
ENV.getAllowTransactionTypes().stream().map(TransactionType::valueOf).collect(Collectors.toList());
List<String> allowProviders = ENV.getAllowXAProviders().isEmpty()
? ALL_XA_PROVIDERS : ENV.getAllowXAProviders();
diff --git
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
index bc69c51d397..9b5646b0e36 100644
---
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
+++
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/engine/base/TransactionBaseE2EIT.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.transaction.engine.base;
import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.data.pipeline.core.util.ThreadUtil;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterContainerEnum;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.transaction.cases.base.BaseTransactionTestCase;
import
org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
import
org.apache.shardingsphere.test.e2e.transaction.framework.param.TransactionTestParameter;
@@ -120,7 +120,7 @@ public abstract class TransactionBaseE2EIT extends
BaseE2EIT {
}
protected void callTestCases(final TransactionTestParameter testParam)
throws SQLException {
- if
(AdapterContainerEnum.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter()))
{
+ if
(AdapterType.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter())) {
for (TransactionType each : testParam.getTransactionTypes()) {
if (TransactionType.LOCAL.equals(each)) {
log.info("Call transaction IT {}, alter transaction rule
{}.", testParam, "");
diff --git
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/enums/TransactionTestCaseRegistry.java
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/enums/TransactionTestCaseRegistry.java
index b0c6062051b..5305b4ff52a 100644
---
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/enums/TransactionTestCaseRegistry.java
+++
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/env/enums/TransactionTestCaseRegistry.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.transaction.env.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterContainerEnum;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.transaction.engine.base.TransactionBaseE2EIT;
import
org.apache.shardingsphere.test.e2e.transaction.engine.constants.TransactionTestConstants;
import
org.apache.shardingsphere.test.e2e.transaction.engine.database.mysql.MySQLJdbcTransactionE2ETT;
@@ -33,17 +33,17 @@ import
org.apache.shardingsphere.test.e2e.transaction.engine.database.postgresql
@Getter
public enum TransactionTestCaseRegistry {
- MySQL_JDBC_IT(MySQLJdbcTransactionE2ETT.class,
TransactionTestConstants.MYSQL, AdapterContainerEnum.JDBC.getValue()),
+ MySQL_JDBC_IT(MySQLJdbcTransactionE2ETT.class,
TransactionTestConstants.MYSQL, AdapterType.JDBC.getValue()),
- MySQL_PROXY_IT(MySQLProxyTransactionE2EIT.class,
TransactionTestConstants.MYSQL, AdapterContainerEnum.PROXY.getValue()),
+ MySQL_PROXY_IT(MySQLProxyTransactionE2EIT.class,
TransactionTestConstants.MYSQL, AdapterType.PROXY.getValue()),
- OPENGAUSS_JDBC_IT(OpenGaussJdbcTransactionE2EIT.class,
TransactionTestConstants.OPENGAUSS, AdapterContainerEnum.JDBC.getValue()),
+ OPENGAUSS_JDBC_IT(OpenGaussJdbcTransactionE2EIT.class,
TransactionTestConstants.OPENGAUSS, AdapterType.JDBC.getValue()),
- OPENGAUSS_PROXY_IT(OpenGaussProxyTransactionE2EIT.class,
TransactionTestConstants.OPENGAUSS, AdapterContainerEnum.PROXY.getValue()),
+ OPENGAUSS_PROXY_IT(OpenGaussProxyTransactionE2EIT.class,
TransactionTestConstants.OPENGAUSS, AdapterType.PROXY.getValue()),
- POSTGRESQL_JDBC_IT(PostgreSQLJdbcTransactionE2EIT.class,
TransactionTestConstants.POSTGRESQL, AdapterContainerEnum.JDBC.getValue()),
+ POSTGRESQL_JDBC_IT(PostgreSQLJdbcTransactionE2EIT.class,
TransactionTestConstants.POSTGRESQL, AdapterType.JDBC.getValue()),
- POSTGRESQL_PROXY_IT(PostgreSQLProxyTransactionE2EIT.class,
TransactionTestConstants.POSTGRESQL, AdapterContainerEnum.PROXY.getValue());
+ POSTGRESQL_PROXY_IT(PostgreSQLProxyTransactionE2EIT.class,
TransactionTestConstants.POSTGRESQL, AdapterType.PROXY.getValue());
private final Class<? extends TransactionBaseE2EIT> testCaseClass;
diff --git
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/DockerContainerComposer.java
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/DockerContainerComposer.java
index 20bad2bc4b7..81495476eb5 100644
---
a/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/DockerContainerComposer.java
+++
b/test/e2e/transaction/src/test/java/org/apache/shardingsphere/test/e2e/transaction/framework/container/compose/DockerContainerComposer.java
@@ -23,8 +23,8 @@ import lombok.extern.slf4j.Slf4j;
import org.apache.shardingsphere.infra.database.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.AdapterContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.adapter.impl.ShardingSphereProxyClusterContainer;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterContainerEnum;
-import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterModeEnum;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.container.atomic.enums.AdapterMode;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.GovernanceContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.governance.impl.ZookeeperContainer;
import
org.apache.shardingsphere.test.e2e.env.container.atomic.storage.DockerStorageContainer;
@@ -60,9 +60,9 @@ public final class DockerContainerComposer extends
BaseContainerComposer {
governanceContainer = getContainers().registerContainer(new
ZookeeperContainer());
storageContainer =
getContainers().registerContainer((DockerStorageContainer)
StorageContainerFactory.newInstance(databaseType,
testParam.getStorageContainerImage(), testParam.getScenario(),
StorageContainerConfigurationFactory.newInstance(databaseType)));
- if
(AdapterContainerEnum.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter()))
{
+ if
(AdapterType.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter())) {
jdbcContainer = null;
- proxyContainer = (ShardingSphereProxyClusterContainer)
AdapterContainerFactory.newInstance(AdapterModeEnum.CLUSTER.getValue(),
AdapterContainerEnum.PROXY.getValue(),
+ proxyContainer = (ShardingSphereProxyClusterContainer)
AdapterContainerFactory.newInstance(AdapterMode.CLUSTER, AdapterType.PROXY,
databaseType, storageContainer, testParam.getScenario(),
ProxyClusterContainerConfigurationFactory.newInstance(testParam.getScenario(),
databaseType));
proxyContainer.dependsOn(governanceContainer, storageContainer);
getContainers().registerContainer(proxyContainer);
