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 1039be3b8b1 Move AdapterType into ArtifactEnvironment (#36681)
1039be3b8b1 is described below
commit 1039be3b8b108afd00c1effa0939b25427eef609
Author: Liang Zhang <[email protected]>
AuthorDate: Wed Sep 24 10:54:36 2025 +0800
Move AdapterType into ArtifactEnvironment (#36681)
---
.../agent/engine/env/AgentE2ETestEnvironment.java | 6 ++--
.../container/adapter/AdapterContainerFactory.java | 6 ++--
.../env/container/adapter/enums/AdapterType.java | 35 ----------------------
.../e2e/env/runtime/type/ArtifactEnvironment.java | 17 +++++++++--
.../ClusterShowProcessListContainerComposer.java | 6 ++--
.../engine/base/TransactionBaseE2EIT.java | 6 ++--
.../engine/base/TransactionContainerComposer.java | 4 +--
.../env/enums/TransactionTestCaseRegistry.java | 14 ++++-----
.../TransactionDockerContainerComposer.java | 6 ++--
.../test/e2e/sql/env/SQLE2EEnvironmentEngine.java | 6 ++--
.../compose/ContainerComposerRegistry.java | 16 +++++-----
.../compose/mode/ClusterContainerComposer.java | 6 ++--
.../compose/mode/StandaloneContainerComposer.java | 6 ++--
.../JdbcStandaloneTestParameterGenerator.java | 4 +--
.../shardingsphere/test/e2e/sql/it/SQLE2EIT.java | 4 +--
15 files changed, 60 insertions(+), 82 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 c46b631fa0f..3f963d90b51 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
@@ -34,7 +34,6 @@ import
org.apache.shardingsphere.test.e2e.agent.fixture.proxy.ProxyRequestExecut
import org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
import org.apache.shardingsphere.test.e2e.env.container.E2EContainers;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyDockerContainer;
import
org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainerConstants;
import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainer;
@@ -42,6 +41,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.governance.option.Govern
import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
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.type.ArtifactEnvironment.Adapter;
import org.awaitility.Awaitility;
import org.testcontainers.containers.output.OutputFrame;
@@ -100,9 +100,9 @@ public final class AgentE2ETestEnvironment {
}
StorageContainerOption storageContainerOption =
DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType);
Optional<DockerE2EContainer> agentPluginContainer =
TypedSPILoader.findService(AgentPluginContainerFactory.class,
testConfig.getPluginType()).map(AgentPluginContainerFactory::create);
- if
(AdapterType.PROXY.getValue().equalsIgnoreCase(testConfig.getAdapter())) {
+ if
(Adapter.PROXY.getValue().equalsIgnoreCase(testConfig.getAdapter())) {
createProxyEnvironment(storageContainerOption,
agentPluginContainer.orElse(null));
- } else if
(AdapterType.JDBC.getValue().equalsIgnoreCase(testConfig.getAdapter())) {
+ } else if
(Adapter.JDBC.getValue().equalsIgnoreCase(testConfig.getAdapter())) {
createJDBCEnvironment(storageContainerOption,
agentPluginContainer.orElse(null));
}
log.info("Waiting to collect data ...");
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainerFactory.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainerFactory.java
index e6f8e3a5c72..9d29bb689cd 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainerFactory.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/AdapterContainerFactory.java
@@ -21,11 +21,11 @@ import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereJdbcEmbeddedContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyDockerContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyEmbeddedContainer;
import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Adapter;
import org.apache.shardingsphere.test.e2e.env.runtime.type.RunEnvironment;
import
org.apache.shardingsphere.test.e2e.env.runtime.type.scenario.path.ScenarioCommonPath;
@@ -38,7 +38,7 @@ public final class AdapterContainerFactory {
/**
* Create new instance of adapter container.
*
- * @param adapter adapter type
+ * @param adapter adapter
* @param databaseType database type
* @param scenario scenario
* @param containerConfig adaptor container configuration
@@ -47,7 +47,7 @@ public final class AdapterContainerFactory {
* @return created instance
* @throws RuntimeException runtime exception
*/
- public static AdapterContainer newInstance(final AdapterType adapter,
final DatabaseType databaseType, final String scenario,
+ public static AdapterContainer newInstance(final Adapter adapter, final
DatabaseType databaseType, final String scenario,
final
AdaptorContainerConfiguration containerConfig, final StorageContainer
storageContainer, final String envType) {
switch (adapter) {
case PROXY:
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/enums/AdapterType.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/enums/AdapterType.java
deleted file mode 100644
index 0bc67c0eec6..00000000000
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/container/adapter/enums/AdapterType.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.test.e2e.env.container.adapter.enums;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-
-/**
- * Adapter type.
- */
-@RequiredArgsConstructor
-@Getter
-public enum AdapterType {
-
- JDBC("jdbc"),
-
- PROXY("proxy");
-
- private final String value;
-}
diff --git
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ArtifactEnvironment.java
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ArtifactEnvironment.java
index 8a6f4b1809b..da94fb8ba1f 100644
---
a/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ArtifactEnvironment.java
+++
b/test/e2e/env/src/test/java/org/apache/shardingsphere/test/e2e/env/runtime/type/ArtifactEnvironment.java
@@ -19,6 +19,7 @@ package org.apache.shardingsphere.test.e2e.env.runtime.type;
import com.google.common.base.Splitter;
import lombok.Getter;
+import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.spi.ShardingSphereServiceLoader;
import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
@@ -56,8 +57,9 @@ public final class ArtifactEnvironment {
}
private Map<DatabaseType, String> getDatabaseImages(final Properties
props) {
- Map<DatabaseType, String> result = new HashMap<>();
- for (DatabaseType each :
ShardingSphereServiceLoader.getServiceInstances(DatabaseType.class)) {
+ Collection<DatabaseType> databaseTypes =
ShardingSphereServiceLoader.getServiceInstances(DatabaseType.class);
+ Map<DatabaseType, String> result = new HashMap<>(databaseTypes.size(),
1F);
+ for (DatabaseType each : databaseTypes) {
Optional.ofNullable(props.getProperty(String.format("e2e.artifact.database.%s.image",
each.getType().toLowerCase()))).ifPresent(value -> result.put(each, value));
}
return result;
@@ -76,4 +78,15 @@ public final class ArtifactEnvironment {
STANDALONE, CLUSTER
}
+
+ @RequiredArgsConstructor
+ @Getter
+ public enum Adapter {
+
+ JDBC("jdbc"),
+
+ PROXY("proxy");
+
+ private final String value;
+ }
}
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 91a2b357ad5..b1bf3d71b0b 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
@@ -25,7 +25,6 @@ import
org.apache.shardingsphere.test.e2e.env.container.E2EContainers;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.constants.ProxyContainerConstants;
import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainer;
import
org.apache.shardingsphere.test.e2e.env.container.governance.option.GovernanceContainerOption;
@@ -33,6 +32,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer
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.env.runtime.type.ArtifactEnvironment.Adapter;
import
org.apache.shardingsphere.test.e2e.operation.showprocesslist.env.ShowProcessListEnvironment;
import
org.apache.shardingsphere.test.e2e.operation.showprocesslist.parameter.ShowProcessListTestParameter;
@@ -65,8 +65,8 @@ public final class ClusterShowProcessListContainerComposer
implements AutoClosea
getMountedResources(testParam.getScenario(),
testParam.getDatabaseType(), testParam.getMode(),
testParam.getRegCenterType()), AdapterContainerUtils.getAdapterContainerImage(),
"");
String envType =
ShowProcessListEnvironment.getInstance().getItEnvType().name();
- jdbcContainer = AdapterContainerFactory.newInstance(AdapterType.JDBC,
testParam.getDatabaseType(), testParam.getScenario(), containerConfig,
storageContainer, envType);
- proxyContainer =
AdapterContainerFactory.newInstance(AdapterType.PROXY,
testParam.getDatabaseType(), testParam.getScenario(), containerConfig,
storageContainer, envType);
+ jdbcContainer = AdapterContainerFactory.newInstance(Adapter.JDBC,
testParam.getDatabaseType(), testParam.getScenario(), containerConfig,
storageContainer, envType);
+ proxyContainer = AdapterContainerFactory.newInstance(Adapter.PROXY,
testParam.getDatabaseType(), testParam.getScenario(), containerConfig,
storageContainer, envType);
if (proxyContainer instanceof DockerE2EContainer) {
if (isClusterMode(testParam.getMode())) {
((DockerE2EContainer)
proxyContainer).dependsOn(governanceContainer);
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
index cb99070fdcd..e950da98b57 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionBaseE2EIT.java
@@ -24,10 +24,10 @@ import lombok.extern.slf4j.Slf4j;
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.adapter.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageContainerConnectOption;
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.type.ArtifactEnvironment.Adapter;
import
org.apache.shardingsphere.test.e2e.operation.transaction.cases.base.BaseTransactionTestCase;
import
org.apache.shardingsphere.test.e2e.operation.transaction.cases.base.BaseTransactionTestCase.TransactionTestCaseParameter;
import
org.apache.shardingsphere.test.e2e.operation.transaction.engine.command.CommonSQLCommand;
@@ -110,7 +110,7 @@ public abstract class TransactionBaseE2EIT {
}
private void callTestCases(final TransactionTestParameter testParam, final
TransactionContainerComposer containerComposer) throws SQLException {
- if
(AdapterType.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter())) {
+ if (Adapter.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter()))
{
for (TransactionType each : testParam.getTransactionTypes()) {
if (TransactionType.LOCAL == each) {
log.info("Call transaction IT {}, alter transaction rule
{}.", testParam, "");
@@ -402,7 +402,7 @@ public abstract class TransactionBaseE2EIT {
private void setTestParameters(final Map<String,
TransactionTestParameter> testParams, final TransactionTestCaseRegistry
registry, final String databaseVersion,
final TransactionTestCase
transactionTestCase, final String scenario, final Class<? extends
BaseTransactionTestCase> caseClass) {
- if
(AdapterType.PROXY.getValue().equals(registry.getRunningAdaptor())) {
+ if (Adapter.PROXY.getValue().equals(registry.getRunningAdaptor()))
{
List<TransactionType> allowedTransactionTypes =
ENV.getAllowTransactionTypes().isEmpty() ?
Arrays.stream(TransactionType.values()).collect(Collectors.toList())
:
ENV.getAllowTransactionTypes().stream().map(TransactionType::valueOf).collect(Collectors.toList());
List<String> allowedProviders =
ENV.getAllowXAProviders().isEmpty() ? ALL_XA_PROVIDERS :
ENV.getAllowXAProviders();
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionContainerComposer.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionContainerComposer.java
index 4d590efac53..8c18464a014 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionContainerComposer.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/engine/base/TransactionContainerComposer.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.operation.transaction.engine.base;
import lombok.Getter;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Adapter;
import
org.apache.shardingsphere.test.e2e.operation.transaction.env.TransactionE2EEnvironment;
import
org.apache.shardingsphere.test.e2e.operation.transaction.env.enums.TransactionE2EEnvTypeEnum;
import
org.apache.shardingsphere.test.e2e.operation.transaction.framework.container.compose.TransactionBaseContainerComposer;
@@ -56,7 +56,7 @@ public final class TransactionContainerComposer implements
AutoCloseable {
}
private boolean isProxyAdapter(final TransactionTestParameter testParam) {
- return
AdapterType.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter());
+ return
Adapter.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter());
}
private DataSource createProxyDataSource() {
diff --git
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/enums/TransactionTestCaseRegistry.java
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/enums/TransactionTestCaseRegistry.java
index 0d07770f176..3f521c2456a 100644
---
a/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/enums/TransactionTestCaseRegistry.java
+++
b/test/e2e/operation/transaction/src/test/java/org/apache/shardingsphere/test/e2e/operation/transaction/env/enums/TransactionTestCaseRegistry.java
@@ -19,7 +19,7 @@ package
org.apache.shardingsphere.test.e2e.operation.transaction.env.enums;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Adapter;
import
org.apache.shardingsphere.test.e2e.operation.transaction.engine.base.TransactionBaseE2EIT;
import
org.apache.shardingsphere.test.e2e.operation.transaction.engine.constants.TransactionTestConstants;
import
org.apache.shardingsphere.test.e2e.operation.transaction.engine.database.mysql.MySQLJdbcTransactionE2ETT;
@@ -33,17 +33,17 @@ import
org.apache.shardingsphere.test.e2e.operation.transaction.engine.database.
@Getter
public enum TransactionTestCaseRegistry {
- MYSQL_JDBC_IT(MySQLJdbcTransactionE2ETT.class,
TransactionTestConstants.MYSQL, AdapterType.JDBC.getValue()),
+ MYSQL_JDBC_IT(MySQLJdbcTransactionE2ETT.class,
TransactionTestConstants.MYSQL, Adapter.JDBC.getValue()),
- MYSQL_PROXY_IT(MySQLProxyTransactionE2EIT.class,
TransactionTestConstants.MYSQL, AdapterType.PROXY.getValue()),
+ MYSQL_PROXY_IT(MySQLProxyTransactionE2EIT.class,
TransactionTestConstants.MYSQL, Adapter.PROXY.getValue()),
- OPENGAUSS_JDBC_IT(OpenGaussJdbcTransactionE2EIT.class,
TransactionTestConstants.OPENGAUSS, AdapterType.JDBC.getValue()),
+ OPENGAUSS_JDBC_IT(OpenGaussJdbcTransactionE2EIT.class,
TransactionTestConstants.OPENGAUSS, Adapter.JDBC.getValue()),
- OPENGAUSS_PROXY_IT(OpenGaussProxyTransactionE2EIT.class,
TransactionTestConstants.OPENGAUSS, AdapterType.PROXY.getValue()),
+ OPENGAUSS_PROXY_IT(OpenGaussProxyTransactionE2EIT.class,
TransactionTestConstants.OPENGAUSS, Adapter.PROXY.getValue()),
- POSTGRESQL_JDBC_IT(PostgreSQLJdbcTransactionE2EIT.class,
TransactionTestConstants.POSTGRESQL, AdapterType.JDBC.getValue()),
+ POSTGRESQL_JDBC_IT(PostgreSQLJdbcTransactionE2EIT.class,
TransactionTestConstants.POSTGRESQL, Adapter.JDBC.getValue()),
- POSTGRESQL_PROXY_IT(PostgreSQLProxyTransactionE2EIT.class,
TransactionTestConstants.POSTGRESQL, AdapterType.PROXY.getValue());
+ POSTGRESQL_PROXY_IT(PostgreSQLProxyTransactionE2EIT.class,
TransactionTestConstants.POSTGRESQL, Adapter.PROXY.getValue());
private final Class<? extends TransactionBaseE2EIT> testCaseClass;
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 19bb9fd5457..c370cd26c8c 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
@@ -27,7 +27,6 @@ import
org.apache.shardingsphere.test.e2e.env.container.DockerE2EContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereJdbcEmbeddedContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.impl.ShardingSphereProxyEmbeddedContainer;
import
org.apache.shardingsphere.test.e2e.env.container.governance.GovernanceContainer;
@@ -36,6 +35,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.storage.StorageContainer
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.type.ArtifactEnvironment.Adapter;
import
org.apache.shardingsphere.test.e2e.operation.transaction.env.TransactionE2EEnvironment;
import
org.apache.shardingsphere.test.e2e.operation.transaction.env.enums.TransactionE2EEnvTypeEnum;
import
org.apache.shardingsphere.test.e2e.operation.transaction.framework.container.config.TransactionProxyContainerConfigurationFactory;
@@ -68,10 +68,10 @@ public final class TransactionDockerContainerComposer
extends TransactionBaseCon
} else {
storageContainer = getContainers().registerContainer(new
NativeStorageContainer(databaseType, testParam.getScenario()));
}
- if
(AdapterType.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter())) {
+ if (Adapter.PROXY.getValue().equalsIgnoreCase(testParam.getAdapter()))
{
jdbcContainer = null;
AdaptorContainerConfiguration containerConfig =
TransactionProxyContainerConfigurationFactory.newInstance(testParam.getScenario(),
databaseType, testParam.getPortBindings());
- proxyContainer =
AdapterContainerFactory.newInstance(AdapterType.PROXY, databaseType,
testParam.getScenario(), containerConfig, storageContainer, envType.name());
+ proxyContainer =
AdapterContainerFactory.newInstance(Adapter.PROXY, databaseType,
testParam.getScenario(), containerConfig, storageContainer, envType.name());
if (proxyContainer instanceof DockerE2EContainer) {
((DockerE2EContainer)
proxyContainer).dependsOn(governanceContainer, storageContainer);
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/SQLE2EEnvironmentEngine.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/SQLE2EEnvironmentEngine.java
index 581c8a73fc2..9e0d08de355 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/SQLE2EEnvironmentEngine.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/SQLE2EEnvironmentEngine.java
@@ -21,8 +21,8 @@ import lombok.AccessLevel;
import lombok.Getter;
import org.apache.shardingsphere.database.connector.core.DefaultDatabase;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
import org.apache.shardingsphere.test.e2e.env.container.util.SQLScriptUtils;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Adapter;
import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Mode;
import
org.apache.shardingsphere.test.e2e.env.runtime.type.scenario.path.ScenarioDataPath;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.ContainerComposer;
@@ -53,8 +53,8 @@ public final class SQLE2EEnvironmentEngine {
private final Map<String, DataSource> expectedDataSourceMap;
- public SQLE2EEnvironmentEngine(final String key, final String scenario,
final DatabaseType databaseType, final Mode mode, final AdapterType
adapterType) {
- containerComposer =
CONTAINER_COMPOSER_REGISTRY.getContainerComposer(key, scenario, databaseType,
mode, adapterType);
+ public SQLE2EEnvironmentEngine(final String key, final String scenario,
final DatabaseType databaseType, final Mode mode, final Adapter adapter) {
+ containerComposer =
CONTAINER_COMPOSER_REGISTRY.getContainerComposer(key, scenario, databaseType,
mode, adapter);
containerComposer.start();
actualDataSourceMap = containerComposer.getActualDataSourceMap();
targetDataSource = containerComposer.getTargetDataSource();
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
index 319dcab8be4..d2cf95b3279 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/env/container/compose/ContainerComposerRegistry.java
@@ -20,7 +20,7 @@ package
org.apache.shardingsphere.test.e2e.sql.env.container.compose;
import com.google.common.base.Preconditions;
import lombok.SneakyThrows;
import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Adapter;
import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Mode;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.mode.ClusterContainerComposer;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.mode.StandaloneContainerComposer;
@@ -47,27 +47,27 @@ public final class ContainerComposerRegistry implements
AutoCloseable {
* @param scenario scenario
* @param databaseType databaseType
* @param mode mode
- * @param adapterType adapterType
+ * @param adapter adapter
* @return composed container
*/
- public ContainerComposer getContainerComposer(final String key, final
String scenario, final DatabaseType databaseType, final Mode mode, final
AdapterType adapterType) {
+ public ContainerComposer getContainerComposer(final String key, final
String scenario, final DatabaseType databaseType, final Mode mode, final
Adapter adapter) {
if (containerComposers.containsKey(key)) {
return containerComposers.get(key);
}
synchronized (containerComposers) {
if (!containerComposers.containsKey(key)) {
- containerComposers.put(key,
createContainerComposer(isClusterMode(mode, adapterType), scenario,
databaseType, adapterType));
+ containerComposers.put(key,
createContainerComposer(isClusterMode(mode, adapter), scenario, databaseType,
adapter));
}
return containerComposers.get(key);
}
}
- private boolean isClusterMode(final Mode mode, final AdapterType
adapterType) {
- return Mode.CLUSTER == mode && AdapterType.PROXY == adapterType;
+ private boolean isClusterMode(final Mode mode, final Adapter adapter) {
+ return Mode.CLUSTER == mode && Adapter.PROXY == adapter;
}
- private ContainerComposer createContainerComposer(final boolean
clusterMode, final String scenario, final DatabaseType databaseType, final
AdapterType adapterType) {
- return clusterMode ? new ClusterContainerComposer(scenario,
databaseType, adapterType) : new StandaloneContainerComposer(scenario,
databaseType, adapterType);
+ private ContainerComposer createContainerComposer(final boolean
clusterMode, final String scenario, final DatabaseType databaseType, final
Adapter adapter) {
+ return clusterMode ? new ClusterContainerComposer(scenario,
databaseType, adapter) : new StandaloneContainerComposer(scenario,
databaseType, adapter);
}
@Override
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 4d6c8f41361..a80db5dd980 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
@@ -25,7 +25,6 @@ import
org.apache.shardingsphere.test.e2e.env.container.E2EContainers;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
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.option.GovernanceContainerOption;
@@ -34,6 +33,7 @@ import
org.apache.shardingsphere.test.e2e.env.container.storage.option.StorageCo
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;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Adapter;
import org.apache.shardingsphere.test.e2e.env.runtime.type.RunEnvironment.Type;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.ContainerComposer;
import
org.apache.shardingsphere.test.e2e.sql.env.container.config.SQLE2EProxyContainerConfigurationFactory;
@@ -54,7 +54,7 @@ public final class ClusterContainerComposer implements
ContainerComposer {
private final AdapterContainer adapterContainer;
- public ClusterContainerComposer(final String scenario, final DatabaseType
databaseType, final AdapterType adapterType) {
+ public ClusterContainerComposer(final String scenario, final DatabaseType
databaseType, final Adapter adapter) {
containers = new E2EContainers(scenario);
// TODO support other types of governance
governanceContainer = containers.registerContainer(new
GovernanceContainer(TypedSPILoader.getService(GovernanceContainerOption.class,
"ZooKeeper")));
@@ -64,7 +64,7 @@ public final class ClusterContainerComposer implements
ContainerComposer {
DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType),
scenario)
: new NativeStorageContainer(databaseType, scenario));
AdaptorContainerConfiguration containerConfig =
SQLE2EProxyContainerConfigurationFactory.newInstance(scenario, "cluster",
databaseType);
- AdapterContainer adapterContainer =
AdapterContainerFactory.newInstance(adapterType, databaseType, scenario,
containerConfig, storageContainer, envType.name());
+ AdapterContainer adapterContainer =
AdapterContainerFactory.newInstance(adapter, databaseType, scenario,
containerConfig, storageContainer, envType.name());
if (adapterContainer instanceof DockerE2EContainer) {
((DockerE2EContainer)
adapterContainer).dependsOn(governanceContainer, storageContainer);
}
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 a56848f27a3..b3e0d1bda0b 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
@@ -24,12 +24,12 @@ import
org.apache.shardingsphere.test.e2e.env.container.E2EContainers;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainer;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.AdapterContainerFactory;
import
org.apache.shardingsphere.test.e2e.env.container.adapter.config.AdaptorContainerConfiguration;
-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.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;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Adapter;
import org.apache.shardingsphere.test.e2e.env.runtime.type.RunEnvironment.Type;
import
org.apache.shardingsphere.test.e2e.sql.env.container.compose.ContainerComposer;
import
org.apache.shardingsphere.test.e2e.sql.env.container.config.SQLE2EProxyContainerConfigurationFactory;
@@ -48,7 +48,7 @@ public final class StandaloneContainerComposer implements
ContainerComposer {
private final AdapterContainer adapterContainer;
- public StandaloneContainerComposer(final String scenario, final
DatabaseType databaseType, final AdapterType adapterType) {
+ public StandaloneContainerComposer(final String scenario, final
DatabaseType databaseType, final Adapter adapter) {
containers = new E2EContainers(scenario);
Type envType =
E2ETestEnvironment.getInstance().getRunEnvironment().getType();
storageContainer = containers.registerContainer(Type.DOCKER == envType
@@ -56,7 +56,7 @@ public final class StandaloneContainerComposer implements
ContainerComposer {
DatabaseTypedSPILoader.getService(StorageContainerOption.class, databaseType),
scenario)
: new NativeStorageContainer(databaseType, scenario));
AdaptorContainerConfiguration containerConfig =
SQLE2EProxyContainerConfigurationFactory.newInstance(scenario, "standalone",
databaseType);
- AdapterContainer adapterContainer =
AdapterContainerFactory.newInstance(adapterType, databaseType, scenario,
containerConfig, storageContainer, envType.name());
+ AdapterContainer adapterContainer =
AdapterContainerFactory.newInstance(adapter, databaseType, scenario,
containerConfig, storageContainer, envType.name());
if (adapterContainer instanceof DockerE2EContainer) {
((DockerE2EContainer)
adapterContainer).dependsOn(storageContainer);
}
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
index 251e13ca786..7699728b902 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/framework/param/array/JdbcStandaloneTestParameterGenerator.java
@@ -19,8 +19,8 @@ package
org.apache.shardingsphere.test.e2e.sql.framework.param.array;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
import org.apache.shardingsphere.test.e2e.env.runtime.E2ETestEnvironment;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Adapter;
import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Mode;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.AssertionTestParameter;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
@@ -35,7 +35,7 @@ import java.util.Collections;
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class JdbcStandaloneTestParameterGenerator {
- private static final Collection<String> ADAPTERS =
Collections.singleton(AdapterType.JDBC.getValue());
+ private static final Collection<String> ADAPTERS =
Collections.singleton(Adapter.JDBC.getValue());
private static final E2ETestEnvironment ENV =
E2ETestEnvironment.getInstance();
diff --git
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/SQLE2EIT.java
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/SQLE2EIT.java
index c0bb95b22e6..7bdd5f5a8c3 100644
---
a/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/SQLE2EIT.java
+++
b/test/e2e/sql/src/test/java/org/apache/shardingsphere/test/e2e/sql/it/SQLE2EIT.java
@@ -17,7 +17,7 @@
package org.apache.shardingsphere.test.e2e.sql.it;
-import
org.apache.shardingsphere.test.e2e.env.container.adapter.enums.AdapterType;
+import
org.apache.shardingsphere.test.e2e.env.runtime.type.ArtifactEnvironment.Adapter;
import org.apache.shardingsphere.test.e2e.sql.env.SQLE2EEnvironmentEngine;
import
org.apache.shardingsphere.test.e2e.sql.framework.param.model.E2ETestParameter;
import
org.apache.shardingsphere.test.e2e.sql.it.SQLE2EIT.SQLE2EITEnvironmentExtension;
@@ -64,7 +64,7 @@ public interface SQLE2EIT {
private void setEnvironmentEngine(final ExtensionContext
extensionContext, final E2ETestParameter testParam) {
SQLE2EEnvironmentEngine environmentEngine = new
SQLE2EEnvironmentEngine(
- testParam.getKey(), testParam.getScenario(),
testParam.getDatabaseType(), testParam.getMode(),
AdapterType.valueOf(testParam.getAdapter().toUpperCase()));
+ testParam.getKey(), testParam.getScenario(),
testParam.getDatabaseType(), testParam.getMode(),
Adapter.valueOf(testParam.getAdapter().toUpperCase()));
((SQLE2EIT)
extensionContext.getRequiredTestInstance()).setEnvironmentEngine(environmentEngine);
}
}
